diff --git a/common/dfx_utils/src/daudio_hidumper.cpp b/common/dfx_utils/src/daudio_hidumper.cpp index 93a6098cc16eb6c30306314a3ccaa40d995ced7d..4f54587b09f27b161475b54e2aea23705367bc59 100644 --- a/common/dfx_utils/src/daudio_hidumper.cpp +++ b/common/dfx_utils/src/daudio_hidumper.cpp @@ -138,10 +138,10 @@ int32_t DaudioHidumper::GetSinkInfo(std::string &result) DHLOGE("Get all adapters failed."); return ERR_DH_AUDIO_NULLPTR; } - for (int32_t index = 0; index < adapterdesc_.size(); index++) { + for (size_t index = 0; index < adapterdesc_.size(); index++) { AudioAdapterDescriptor desc = adapterdesc_[index]; result.append("sinkDevId: ").append(GetAnonyString(desc.adapterName)).append(" portId: "); - for (uint32_t i = 0; i < desc.ports.size(); i++) { + for (size_t i = 0; i < desc.ports.size(); i++) { result.append(std::to_string(desc.ports[i].portId)).append(" "); } } diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp index 050cd2f8e29a299bbd768c782e2b23fcc5f455b5..5efcdd7de09def604312ddc18946bdbd9e1e40d4 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_ipc_callback.cpp @@ -29,8 +29,8 @@ int32_t DAudioSinkIpcCallback::OnNotifyResourceInfo(const ResourceEventType &typ const std::string &networkId, bool &isSensitive, bool &isSameAccount) { DHLOGI("On notify the resource info, subType: %{public}s, networkId: %{public}s, isSensitive: " - "%{public}d, isSameAccount: %{public}d", subType.c_str(), networkId.c_str(), isSensitive, isSameAccount); - + "%{public}d, isSameAccount: %{public}d", subType.c_str(), GetAnonyString(networkId).c_str(), + isSensitive, isSameAccount); int32_t ret = DH_SUCCESS; std::lock_guard resourceLck(privacyResMtx_); auto iter = privacyResCallback_.begin(); diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp index b150ebd76acce00d3afada9823fac46d7a6ce3cd..eb0eea98285fd9552ed5302cfda5f785d35ad303 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp @@ -27,6 +27,7 @@ namespace OHOS { namespace DistributedHardware { int32_t DAudioSinkProxy::InitSink(const std::string ¶ms, const sptr &sinkCallback) { + CHECK_AND_RETURN_RET_LOG(sinkCallback == nullptr, ERR_DH_AUDIO_NULLPTR, "sinkCallback is nullptr"); MessageParcel data; MessageParcel reply; MessageOption option; diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp index 112eaec414d1e50b320058350e621073f189c22d..9bee5a57cea97d35b886c81e0bc869cd2a84effc 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp @@ -27,6 +27,7 @@ namespace OHOS { namespace DistributedHardware { int32_t DAudioSourceProxy::InitSource(const std::string ¶ms, const sptr &callback) { + CHECK_AND_RETURN_RET_LOG(callback == nullptr, ERR_DH_AUDIO_NULLPTR, "callback is nullptr"); MessageParcel data; MessageParcel reply; MessageOption option; diff --git a/services/audiomanager/managersink/include/daudio_sink_manager.h b/services/audiomanager/managersink/include/daudio_sink_manager.h index a88bcba4b07c44e09e91860d56a4ac4d26d59ba7..0686c8dedb7ee799f17ad8ebfdb6de8ab05fb070 100644 --- a/services/audiomanager/managersink/include/daudio_sink_manager.h +++ b/services/audiomanager/managersink/include/daudio_sink_manager.h @@ -84,15 +84,15 @@ private: std::string localNetworkId_; ChannelState channelState_ = ChannelState::UNKNOWN; - std::shared_ptr providerListener_; + std::shared_ptr providerListener_ = nullptr; IAVEngineProvider *sendProviderPtr_ = nullptr; IAVEngineProvider *rcvProviderPtr_ = nullptr; void *pSHandler_ = nullptr; void *pRHandler_ = nullptr; - bool isSensitive_; - bool isSameAccount_; + bool isSensitive_ = false; + bool isSameAccount_ = false; sptr ipcSinkCallback_ = nullptr; - std::shared_ptr initCallback_; + std::shared_ptr initCallback_ = nullptr; }; } // DistributedHardware } // OHOS diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 5e308d3c8fa465ea64ffaba3dd8faf3c2cb30a59..80812cd813f4439df8b275217639e36c195ab5bb 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -96,6 +96,7 @@ void DAudioSinkDev::NotifyEvent(const AudioEvent &audioEvent) return; } auto eventParam = std::make_shared(audioEvent); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(static_cast(audioEvent.type), eventParam, 0); CHECK_NULL_VOID(handler_); if (handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 780338b8bad60d7353e8ff77cf88ac712379335a..375cdffab2e496ad6a8d759a672e52d380ff83cd 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -401,7 +401,8 @@ bool DAudioSinkManager::CheckDeviceSecurityLevel(const std::string &srcDeviceId, DHLOGE("dst udid is empty"); return false; } - DHLOGI("CheckDeviceSecurityLevel srcUdid %{public}s, dstUdid %{public}s.", srcUdid.c_str(), dstUdid.c_str()); + DHLOGI("CheckDeviceSecurityLevel srcUdid %{public}s, dstUdid %{public}s.", + GetAnonyString(srcUdid).c_str(), GetAnonyString(dstUdid).c_str()); int32_t srcDeviceSecurityLevel = GetDeviceSecurityLevel(srcUdid); int32_t dstDeviceSecurityLevel = GetDeviceSecurityLevel(dstUdid); DHLOGI("SrcDeviceSecurityLevel, level is %{public}d", srcDeviceSecurityLevel); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index ec9b47cfc073d332bd8dd30a704244dbd573de5c..a43f9b5e76f363c5d8f395d184f6e8a7edcc8202 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -257,8 +257,8 @@ int32_t DAudioSourceDev::HandleOpenDSpeaker(const AudioEvent &event) { DHLOGI("Open speaker device."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); - auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_OPEN_SPEAKER, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -273,6 +273,7 @@ int32_t DAudioSourceDev::HandleCloseDSpeaker(const AudioEvent &event) DHLOGI("Close speaker device."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_CLOSE_SPEAKER, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -323,6 +324,7 @@ int32_t DAudioSourceDev::HandleOpenDMic(const AudioEvent &event) CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_OPEN_MIC, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -337,6 +339,7 @@ int32_t DAudioSourceDev::HandleCloseDMic(const AudioEvent &event) DHLOGI("Close mic device."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_CLOSE_MIC, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -358,6 +361,7 @@ int32_t DAudioSourceDev::HandleDMicClosed(const AudioEvent &event) DHLOGI("Dmic device closed, event.content = %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_DMIC_CLOSED, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -406,6 +410,7 @@ int32_t DAudioSourceDev::HandleVolumeSet(const AudioEvent &event) DHLOGD("Start handle volume set."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_VOLUME_SET, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -420,6 +425,7 @@ int32_t DAudioSourceDev::HandleVolumeChange(const AudioEvent &event) DHLOGD("Start handle volume change."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_VOLUME_CHANGE, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -434,6 +440,7 @@ int32_t DAudioSourceDev::HandleFocusChange(const AudioEvent &event) DHLOGD("Start handle focus change."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_AUDIO_FOCUS_CHANGE, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -448,6 +455,7 @@ int32_t DAudioSourceDev::HandleRenderStateChange(const AudioEvent &event) DHLOGD("Start handle render state change."); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_AUDIO_RENDER_STATE_CHANGE, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -462,6 +470,7 @@ int32_t DAudioSourceDev::HandlePlayStatusChange(const AudioEvent &event) DHLOGD("Play status change, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_CHANGE_PLAY_STATUS, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -476,6 +485,7 @@ int32_t DAudioSourceDev::HandleSpkMmapStart(const AudioEvent &event) DHLOGI("Spk mmap start, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_SPK_START, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -490,6 +500,7 @@ int32_t DAudioSourceDev::HandleSpkMmapStop(const AudioEvent &event) DHLOGI("Spk mmap stop, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_SPK_STOP, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -504,6 +515,7 @@ int32_t DAudioSourceDev::HandleMicMmapStart(const AudioEvent &event) DHLOGI("Mic mmap start, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_MIC_START, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -518,6 +530,7 @@ int32_t DAudioSourceDev::HandleMicMmapStop(const AudioEvent &event) DHLOGI("Mic mmap stop, content: %{public}s.", event.content.c_str()); CHECK_NULL_RETURN(handler_, ERR_DH_AUDIO_NULLPTR); auto eventParam = std::make_shared(event); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MMAP_MIC_STOP, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 43692e731c234683cb9628fbc4d9ae8f41b3bcc1..1aa4c7e1b4bed58afea6dfbefecaf00f38799806 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -179,6 +179,7 @@ int32_t DAudioSourceManager::EnableDAudio(const std::string &devId, const std::s return ERR_DH_AUDIO_NULLPTR; } auto eventParam = std::make_shared(jsonString); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MANAGER_ENABLE_DAUDIO, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -239,6 +240,7 @@ int32_t DAudioSourceManager::DisableDAudio(const std::string &devId, const std:: return ERR_DH_AUDIO_NULLPTR; } auto eventParam = std::make_shared(jsonString); + CHECK_AND_LOG(eventParam == nullptr, "The msgEvent will be null."); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_MANAGER_DISABLE_DAUDIO, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { DHLOGE("Send event failed."); @@ -391,7 +393,7 @@ int32_t DAudioSourceManager::CreateAudioDevice(const std::string &devId) void DAudioSourceManager::DeleteAudioDevice(const std::string &devId, const std::string &dhId) { - DHLOGI("Delete audio device, devId = %{public}s, dhId = %{public}s.", devId.c_str(), dhId.c_str()); + DHLOGI("Delete audio device, devId = %{public}s, dhId = %{public}s.", GetAnonyString(devId).c_str(), dhId.c_str()); { std::lock_guard lock(devMapMtx_); audioDevMap_[devId].ports.erase(dhId); diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp index f77c422488dcb38fb8225bc12e4b779cec55141e..10f4bd393db080ec486f3d93836f177202865675 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp @@ -617,6 +617,7 @@ HWTEST_F(DAudioSinkDevTest, SinkEventHandler_004, TestSize.Level1) sinkDev_->handler_->NotifyFocusChange(msgEvent); sinkDev_->handler_->NotifyRenderStateChange(msgEvent); sinkDev_->handler_->NotifyPlayStatusChange(msgEvent); + std::string eventContent = "{\"dhId\":\"1\"}"; std::string paramResult; AudioEvent audioEvent(eventType, eventContent);