diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index f20ee6477d69f2d26d987836f1ae3d4b4788109d..74e87a7520f230a151d97768716c6876e0c660c2 100644 --- a/services/audiohdiproxy/src/daudio_hdi_handler.cpp +++ b/services/audiohdiproxy/src/daudio_hdi_handler.cpp @@ -83,7 +83,6 @@ int32_t DAudioHdiHandler::UninitHdiHandler() CHECK_NULL_RETURN(audioSrvHdf_, DH_SUCCESS); int32_t ret = DaudioHdfOperate::GetInstance().UnLoadDaudioHDFImpl(); - DaudioRadar::GetInstance().ReportDaudioUnInitProgress("UnLoadDaudioHDFImpl", AudioUnInit::UNLOAD_HDF_DRIVER, ret); if (ret != DH_SUCCESS) { DHLOGE("Unload hdf driver failed, ret: %{public}d", ret); return ret; diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 1100a7534d472a89d4ede29565442a1293b3d79f..b69a85326b825effaee6e6cd3709697a8ce0e024 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -825,15 +825,18 @@ int32_t DAudioSourceDev::TaskDisableDAudio(const std::string &args) } DHLOGI("Parsed dhId = %{public}d", dhId); + int32_t ret = ERR_DH_AUDIO_NOT_SUPPORT; switch (GetDevTypeByDHId(dhId)) { case AUDIO_DEVICE_TYPE_SPEAKER: - return DisableDSpeaker(dhId); + ret = DisableDSpeaker(dhId); case AUDIO_DEVICE_TYPE_MIC: - return DisableDMic(dhId); + ret = DisableDMic(dhId); default: DHLOGE("Unknown audio device. hdId: %{public}d.", dhId); - return ERR_DH_AUDIO_NOT_SUPPORT; } + DaudioRadar::GetInstance().ReportDaudioUnInit("OnDisableDAudio", AudioUnInit::DISABLED, + BizState::BIZ_STATE_END, ret); + return ret; } int32_t DAudioSourceDev::DisableDSpeaker(const int32_t dhId) diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 9177d2bb35cffaae1d64d52a8dde5f1ac373bbf9..a4cb3a3b6bb5029fb3db62e8103b10918179d373 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -399,7 +399,6 @@ int32_t DAudioSourceManager::OnDisableDAudio(const std::string &devId, const std } CHECK_NULL_RETURN(ipcCallback_, ERR_DH_AUDIO_NULLPTR); - DaudioRadar::GetInstance().ReportDaudioUnInitProgress("OnDisableDAudio", AudioUnInit::DISABLED, result); return ipcCallback_->OnNotifyUnregResult(devId, dhId, reqId, result, ""); }