diff --git a/services/audio/src/audio_control_manager.cpp b/services/audio/src/audio_control_manager.cpp index b6ca93003c0dbcac4f44e8056d5c576dedddc970..6f81200208f1535e0a7fb60067fb2de6876f0496 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) { diff --git a/services/call/src/call_control_manager.cpp b/services/call/src/call_control_manager.cpp index b51074a4e9fb473c896b27c46446df87c549229e..fc604f8d195fd4a6d76991a6a23f06e82a8f182d 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, ""); diff --git a/services/distributed_call/src/distributed_call_manager.cpp b/services/distributed_call/src/distributed_call_manager.cpp index 9cf24a876d83301e521b1fd9df6d3c36985e9975..e4e731155f893ad0893b4f4280bf64ea2325d8d1 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);