From 641b5c8224243d39dc7f32fef379b09d8ee868e0 Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Tue, 18 Mar 2025 17:06:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E9=9F=B3=E9=A2=91?= =?UTF-8?q?=E4=BA=92=E8=81=94=E9=9B=B7=E8=BE=BE=E5=8E=BB=E4=BD=BF=E8=83=BD?= =?UTF-8?q?=E6=89=93=E7=82=B9=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhuzhihui7 --- services/audiohdiproxy/src/daudio_hdi_handler.cpp | 1 - .../audiomanager/managersource/src/daudio_source_dev.cpp | 9 ++++++--- .../managersource/src/daudio_source_manager.cpp | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index f20ee647..74e87a75 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 1100a753..b69a8532 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 9177d2bb..a4cb3a3b 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, ""); } -- Gitee