From 3604343bb5549ce52471d4b371e64493436d19ca Mon Sep 17 00:00:00 2001 From: lishuo Date: Sun, 27 Apr 2025 01:15:17 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- services/audio/src/audio_control_manager.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/services/audio/src/audio_control_manager.cpp b/services/audio/src/audio_control_manager.cpp index b6ca9300..6f812002 100644 --- a/services/audio/src/audio_control_manager.cpp +++ b/services/audio/src/audio_control_manager.cpp @@ -548,10 +548,6 @@ int32_t AudioControlManager::HandleBluetoothAudioDevice(const AudioDevice &devic remoteDevice.push_back(audioDev); AudioSystemManager* audioSystemManager = AudioSystemManager::GetInstance(); sptr audioRendererFilter = new(std::nothrow) AudioRendererFilter(); - if (audioRendererFilter == nullptr) { - TELEPHONY_LOGE("audioRendererFilter is nullptr"); - return CALL_ERR_AUDIO_SET_AUDIO_DEVICE_FAILED; - } audioRendererFilter->rendererInfo.streamUsage = StreamUsage::STREAM_USAGE_VOICE_MODEM_COMMUNICATION; int32_t ret = audioSystemManager->SelectOutputDevice(audioRendererFilter, remoteDevice); if (ret != 0) { -- Gitee From 065503d0769b677c862978b630e93be2536d1bd7 Mon Sep 17 00:00:00 2001 From: lishuo Date: Sun, 27 Apr 2025 01:16:37 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- .../distributed_call/src/distributed_call_manager.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/distributed_call/src/distributed_call_manager.cpp b/services/distributed_call/src/distributed_call_manager.cpp index 9cf24a87..e4e73115 100644 --- a/services/distributed_call/src/distributed_call_manager.cpp +++ b/services/distributed_call/src/distributed_call_manager.cpp @@ -463,10 +463,6 @@ void DistributedCallManager::ReportDistributedDeviceInfo(const AudioDevice& devi } } sptr audioRendererFilter = new(std::nothrow) AudioRendererFilter(); - if (audioRendererFilter == nullptr) { - TELEPHONY_LOGE("audioRendererFilter nullptr"); - return; - } audioRendererFilter->rendererInfo.contentType = ContentType::CONTENT_TYPE_SPEECH; audioRendererFilter->rendererInfo.streamUsage = StreamUsage::STREAM_USAGE_VOICE_MODEM_COMMUNICATION; audioSystemMananger->SelectOutputDevice(audioRendererFilter, remoteDevice); @@ -498,10 +494,6 @@ void DistributedCallManager::ReportDistributedDeviceInfoForSwitchOff() } } sptr audioRendererFilter = new(std::nothrow) AudioRendererFilter(); - if (audioRendererFilter == nullptr) { - TELEPHONY_LOGE("audioRendererFilter nullptr"); - return; - } audioRendererFilter->rendererInfo.contentType = ContentType::CONTENT_TYPE_SPEECH; audioRendererFilter->rendererInfo.streamUsage = StreamUsage::STREAM_USAGE_VOICE_MODEM_COMMUNICATION; audioSystemMananger->SelectOutputDevice(audioRendererFilter, remoteDevice); -- Gitee From 6ff107ec2bd2d29e23549339a7010d683d4e78da Mon Sep 17 00:00:00 2001 From: lishuo Date: Sun, 27 Apr 2025 09:35:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- services/call/src/call_control_manager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/call/src/call_control_manager.cpp b/services/call/src/call_control_manager.cpp index b51074a4..fc604f8d 100644 --- a/services/call/src/call_control_manager.cpp +++ b/services/call/src/call_control_manager.cpp @@ -1534,10 +1534,8 @@ int32_t CallControlManager::HandleVoipDisconnected(int32_t &numActive, int32_t n if (carrierCallId != ERR_ID) { TELEPHONY_LOGI("SetVoIPCallInfo handle cs call sucessed"); sptr call = GetOneCallObject(carrierCallId); - if (call != nullptr) { - return DelayedSingleton::GetInstance()-> - SendBtCallState(0, 0, (int32_t)TelCallState::CALL_STATUS_INCOMING, call->GetAccountNumber()); - } + return DelayedSingleton::GetInstance()-> + SendBtCallState(0, 0, (int32_t)TelCallState::CALL_STATUS_INCOMING, call->GetAccountNumber()); } return DelayedSingleton::GetInstance()-> SendBtCallState(numActive, numHeld, (int32_t)TelCallState::CALL_STATUS_IDLE, ""); -- Gitee