From 99da4efc5f4a352ddabba9369653e1affec095bb Mon Sep 17 00:00:00 2001 From: n00810144 Date: Sat, 23 Nov 2024 16:40:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: n00810144 --- .../napi/src/napi_call_ability_callback.cpp | 60 +++++++++ frameworks/native/src/call_manager_proxy.cpp | 4 +- services/audio/src/tone.cpp | 14 +- .../bluetooth/src/bluetooth_call_manager.cpp | 4 +- .../src/report_call_info_handler.cpp | 120 +++++++++++------- 5 files changed, 147 insertions(+), 55 deletions(-) diff --git a/frameworks/js/napi/src/napi_call_ability_callback.cpp b/frameworks/js/napi/src/napi_call_ability_callback.cpp index 42c77474..1c55aed8 100644 --- a/frameworks/js/napi/src/napi_call_ability_callback.cpp +++ b/frameworks/js/napi/src/napi_call_ability_callback.cpp @@ -580,6 +580,11 @@ int32_t NapiCallAbilityCallback::ReportCallState(CallAttributeInfo &info, EventC } napi_value thisVar = nullptr; napi_get_reference_value(env, stateCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, scope); @@ -728,6 +733,11 @@ int32_t NapiCallAbilityCallback::ReportCallEvent(CallEventInfo &info, EventCallb } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callEventCallbackFunc, DATA_LENGTH_ONE, callEventCallbackValues, &callbackResult); napi_close_handle_scope(env, scopeCallEvent); @@ -821,6 +831,11 @@ int32_t NapiCallAbilityCallback::ReportDisconnectedCause( } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, disconnectedScope); @@ -925,6 +940,11 @@ int32_t NapiCallAbilityCallback::ReportMmiCode(MmiCodeInfo &info, EventCallback } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_TWO, callbackValues, &callbackResult); napi_close_handle_scope(env, mmiCodeScope); @@ -1038,6 +1058,11 @@ int32_t NapiCallAbilityCallback::ReportAudioDeviceInfo(AudioDeviceInfo &info, Ev } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, AudioDeviceInfoScope); @@ -1811,6 +1836,11 @@ int32_t NapiCallAbilityCallback::ReportCallOtt( } napi_value thisVar = nullptr; napi_get_reference_value(env, settingInfo.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, callOttscope); @@ -1896,6 +1926,11 @@ int32_t NapiCallAbilityCallback::ReportPostDialDelay(std::string postDialStr, Ev } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, scope); @@ -1990,6 +2025,11 @@ int32_t NapiCallAbilityCallback::ReportCallMediaModeInfo( } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, CallMediaModeInfoScope); @@ -2081,6 +2121,11 @@ int32_t NapiCallAbilityCallback::ReportCallSessionEvent( } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, CallSessionEventScope); @@ -2175,6 +2220,11 @@ int32_t NapiCallAbilityCallback::ReportPeerDimensions( } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, PeerDimensionsDetailScope); @@ -2261,6 +2311,11 @@ int32_t NapiCallAbilityCallback::ReportCallDataUsage(int64_t dataUsage, EventCal } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, CallDataUsageScope); @@ -2355,6 +2410,11 @@ int32_t NapiCallAbilityCallback::ReportCameraCapabilitiesInfo( } napi_value thisVar = nullptr; napi_get_reference_value(env, eventCallback.thisVar, &thisVar); + if (thisVar == nullptr) { + TELEPHONY_LOGE("thisVar is null!"); + napi_close_handle_scope(env, scope); + return CALL_ERR_CALLBACK_NOT_EXIST; + } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); napi_close_handle_scope(env, cameraCapabilitiesScope); diff --git a/frameworks/native/src/call_manager_proxy.cpp b/frameworks/native/src/call_manager_proxy.cpp index 3a6f3133..697d6355 100644 --- a/frameworks/native/src/call_manager_proxy.cpp +++ b/frameworks/native/src/call_manager_proxy.cpp @@ -1619,7 +1619,7 @@ int32_t CallManagerProxy::CancelCallUpgrade(int32_t callId) } int32_t errCode = callManagerServicePtr_->CancelCallUpgrade(callId); if (errCode != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("ReportAudioDeviceInfo failed, errcode:%{public}d", errCode); + TELEPHONY_LOGE("CancelCallUpgrade failed, errcode:%{public}d", errCode); return errCode; } return TELEPHONY_SUCCESS; @@ -1638,7 +1638,7 @@ int32_t CallManagerProxy::RequestCameraCapabilities(int32_t callId) } int32_t errCode = callManagerServicePtr_->RequestCameraCapabilities(callId); if (errCode != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("ReportAudioDeviceInfo failed, errcode:%{public}d", errCode); + TELEPHONY_LOGE("RequestCameraCapabilities failed, errcode:%{public}d", errCode); return errCode; } return TELEPHONY_SUCCESS; diff --git a/services/audio/src/tone.cpp b/services/audio/src/tone.cpp index 3b66bb28..2136d7f1 100644 --- a/services/audio/src/tone.cpp +++ b/services/audio/src/tone.cpp @@ -64,7 +64,11 @@ int32_t Tone::Play() pthread_setname_np(pthread_self(), TONE_PLAY_THREAD); tonePlayerPtr->StartTone(); }); - play.detach(); + if (!play.joinable()) { + TELEPHONY_LOGE("failed to create thread for tone player"); + } else { + play.detach(); + } } else { AudioPlay audioPlay = &AudioPlayer::Play; if (audioPlayer_ == nullptr) { @@ -73,8 +77,12 @@ int32_t Tone::Play() } std::thread play(audioPlay, audioPlayer_, GetToneDescriptorPath(currentToneDescriptor_), AudioStandard::AudioStreamType::STREAM_MUSIC, PlayerType::TYPE_TONE); - pthread_setname_np(play.native_handle(), TONE_PLAY_THREAD); - play.detach(); + if (!play.joinable()) { + TELEPHONY_LOGE("failed to create thread for tone player"); + } else { + pthread_setname_np(play.native_handle(), TONE_PLAY_THREAD); + play.detach(); + } } return TELEPHONY_SUCCESS; } diff --git a/services/bluetooth/src/bluetooth_call_manager.cpp b/services/bluetooth/src/bluetooth_call_manager.cpp index 6b252fc1..4281296c 100644 --- a/services/bluetooth/src/bluetooth_call_manager.cpp +++ b/services/bluetooth/src/bluetooth_call_manager.cpp @@ -33,7 +33,7 @@ int32_t BluetoothCallManager::SendBtCallState( { if (btConnection_ == nullptr) { TELEPHONY_LOGE("bluetooth connection nullptr"); - return false; + return TELEPHONY_ERROR; } return btConnection_->SendBtCallState(numActive, numHeld, callState, number); } @@ -42,7 +42,7 @@ int32_t BluetoothCallManager::SendCallDetailsChange(int32_t callId, int32_t call { if (btConnection_ == nullptr) { TELEPHONY_LOGE("bluetooth connection nullptr"); - return false; + return TELEPHONY_ERROR; } return btConnection_->SendCallDetailsChange(callId, callState); } diff --git a/services/telephony_interaction/src/report_call_info_handler.cpp b/services/telephony_interaction/src/report_call_info_handler.cpp index a113c708..e192896a 100644 --- a/services/telephony_interaction/src/report_call_info_handler.cpp +++ b/services/telephony_interaction/src/report_call_info_handler.cpp @@ -48,14 +48,18 @@ int32_t ReportCallInfoHandler::UpdateCallReportInfo(const CallDetailInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGW("UpdateCallReportInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, callDetailInfo]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - auto ret = managerPtr->HandleCallReportInfo(callDetailInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleCallReportInfo failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + auto ret = managerPtr->HandleCallReportInfo(callDetailInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleCallReportInfo failed! ret:%{public}d", ret); + } } }); return TELEPHONY_SUCCESS; @@ -94,14 +98,18 @@ int32_t ReportCallInfoHandler::UpdateCallsReportInfo(CallDetailsInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGW("UpdateCallsReportInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, callDetailsInfo]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleCallsReportInfo(callDetailsInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleCallsReportInfo failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleCallsReportInfo(callDetailsInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleCallsReportInfo failed! ret:%{public}d", ret); + } } }); @@ -135,14 +143,18 @@ int32_t ReportCallInfoHandler::UpdateDisconnectedCause(const DisconnectedDetails std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateDisconnectedCause submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, disconnectedDetails]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleDisconnectedCause(disconnectedDetails); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleDisconnectedCause failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleDisconnectedCause(disconnectedDetails); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleDisconnectedCause failed! ret:%{public}d", ret); + } } }); @@ -158,14 +170,18 @@ int32_t ReportCallInfoHandler::UpdateEventResultInfo(const CellularCallEventInfo std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateEventResultInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, info]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleEventResultReportInfo(info); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleEventResultReportInfo failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleEventResultReportInfo(info); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleEventResultReportInfo failed! ret:%{public}d", ret); + } } }); @@ -182,14 +198,18 @@ int32_t ReportCallInfoHandler::UpdateOttEventInfo(const OttCallEventInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateOttEventInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, ottCallEventInfo]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleOttEventReportInfo(ottCallEventInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleOttEventReportInfo failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleOttEventReportInfo(ottCallEventInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleOttEventReportInfo failed! ret:%{public}d", ret); + } } }); @@ -248,14 +268,18 @@ int32_t ReportCallInfoHandler::UpdateVoipEventInfo(const VoipCallEventInfo &info std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateVoipEventInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, voipCallEventInfo]() { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleVoipEventReportInfo(voipCallEventInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("UpdateVoipEventInfo failed! ret:%{public}d", ret); + if (callStatusManagerPtr == nullptr) { + TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); + } else { + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleVoipEventReportInfo(voipCallEventInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("UpdateVoipEventInfo failed! ret:%{public}d", ret); + } } }); return TELEPHONY_SUCCESS; -- Gitee From 26420f63bae0f78e5f0a0bc4a060f9768d20cb47 Mon Sep 17 00:00:00 2001 From: n00810144 Date: Sat, 23 Nov 2024 16:43:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: n00810144 --- .../napi/src/napi_call_ability_callback.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frameworks/js/napi/src/napi_call_ability_callback.cpp b/frameworks/js/napi/src/napi_call_ability_callback.cpp index 1c55aed8..b1c01f53 100644 --- a/frameworks/js/napi/src/napi_call_ability_callback.cpp +++ b/frameworks/js/napi/src/napi_call_ability_callback.cpp @@ -583,7 +583,7 @@ int32_t NapiCallAbilityCallback::ReportCallState(CallAttributeInfo &info, EventC if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -736,7 +736,7 @@ int32_t NapiCallAbilityCallback::ReportCallEvent(CallEventInfo &info, EventCallb if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callEventCallbackFunc, DATA_LENGTH_ONE, callEventCallbackValues, &callbackResult); @@ -834,7 +834,7 @@ int32_t NapiCallAbilityCallback::ReportDisconnectedCause( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -943,7 +943,7 @@ int32_t NapiCallAbilityCallback::ReportMmiCode(MmiCodeInfo &info, EventCallback if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_TWO, callbackValues, &callbackResult); @@ -1061,7 +1061,7 @@ int32_t NapiCallAbilityCallback::ReportAudioDeviceInfo(AudioDeviceInfo &info, Ev if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -1839,7 +1839,7 @@ int32_t NapiCallAbilityCallback::ReportCallOtt( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -1929,7 +1929,7 @@ int32_t NapiCallAbilityCallback::ReportPostDialDelay(std::string postDialStr, Ev if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -2028,7 +2028,7 @@ int32_t NapiCallAbilityCallback::ReportCallMediaModeInfo( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -2124,7 +2124,7 @@ int32_t NapiCallAbilityCallback::ReportCallSessionEvent( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -2223,7 +2223,7 @@ int32_t NapiCallAbilityCallback::ReportPeerDimensions( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -2314,7 +2314,7 @@ int32_t NapiCallAbilityCallback::ReportCallDataUsage(int64_t dataUsage, EventCal if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); @@ -2413,7 +2413,7 @@ int32_t NapiCallAbilityCallback::ReportCameraCapabilitiesInfo( if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); - return CALL_ERR_CALLBACK_NOT_EXIST; + return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; napi_call_function(env, thisVar, callbackFunc, DATA_LENGTH_ONE, callbackValues, &callbackResult); -- Gitee From e99ad0f9cec8d0be0b6811df65559188ff375e02 Mon Sep 17 00:00:00 2001 From: n00810144 Date: Wed, 11 Dec 2024 11:01:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: n00810144 --- .../napi/src/napi_call_ability_callback.cpp | 1 - .../src/report_call_info_handler.cpp | 120 +++++++----------- 2 files changed, 48 insertions(+), 73 deletions(-) diff --git a/frameworks/js/napi/src/napi_call_ability_callback.cpp b/frameworks/js/napi/src/napi_call_ability_callback.cpp index b1c01f53..170e8934 100644 --- a/frameworks/js/napi/src/napi_call_ability_callback.cpp +++ b/frameworks/js/napi/src/napi_call_ability_callback.cpp @@ -581,7 +581,6 @@ int32_t NapiCallAbilityCallback::ReportCallState(CallAttributeInfo &info, EventC napi_value thisVar = nullptr; napi_get_reference_value(env, stateCallback.thisVar, &thisVar); if (thisVar == nullptr) { - TELEPHONY_LOGE("thisVar is null!"); napi_close_handle_scope(env, scope); return TELEPHONY_ERROR; } diff --git a/services/telephony_interaction/src/report_call_info_handler.cpp b/services/telephony_interaction/src/report_call_info_handler.cpp index e192896a..a113c708 100644 --- a/services/telephony_interaction/src/report_call_info_handler.cpp +++ b/services/telephony_interaction/src/report_call_info_handler.cpp @@ -48,18 +48,14 @@ int32_t ReportCallInfoHandler::UpdateCallReportInfo(const CallDetailInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGW("UpdateCallReportInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, callDetailInfo]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - auto ret = managerPtr->HandleCallReportInfo(callDetailInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleCallReportInfo failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + auto ret = managerPtr->HandleCallReportInfo(callDetailInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleCallReportInfo failed! ret:%{public}d", ret); } }); return TELEPHONY_SUCCESS; @@ -98,18 +94,14 @@ int32_t ReportCallInfoHandler::UpdateCallsReportInfo(CallDetailsInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGW("UpdateCallsReportInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, callDetailsInfo]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleCallsReportInfo(callDetailsInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleCallsReportInfo failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleCallsReportInfo(callDetailsInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleCallsReportInfo failed! ret:%{public}d", ret); } }); @@ -143,18 +135,14 @@ int32_t ReportCallInfoHandler::UpdateDisconnectedCause(const DisconnectedDetails std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateDisconnectedCause submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, disconnectedDetails]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleDisconnectedCause(disconnectedDetails); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleDisconnectedCause failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleDisconnectedCause(disconnectedDetails); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleDisconnectedCause failed! ret:%{public}d", ret); } }); @@ -170,18 +158,14 @@ int32_t ReportCallInfoHandler::UpdateEventResultInfo(const CellularCallEventInfo std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateEventResultInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, info]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleEventResultReportInfo(info); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleEventResultReportInfo failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleEventResultReportInfo(info); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleEventResultReportInfo failed! ret:%{public}d", ret); } }); @@ -198,18 +182,14 @@ int32_t ReportCallInfoHandler::UpdateOttEventInfo(const OttCallEventInfo &info) std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateOttEventInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, ottCallEventInfo]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleOttEventReportInfo(ottCallEventInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("HandleOttEventReportInfo failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleOttEventReportInfo(ottCallEventInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("HandleOttEventReportInfo failed! ret:%{public}d", ret); } }); @@ -268,18 +248,14 @@ int32_t ReportCallInfoHandler::UpdateVoipEventInfo(const VoipCallEventInfo &info std::weak_ptr callStatusManagerPtr = callStatusManagerPtr_; TELEPHONY_LOGI("UpdateVoipEventInfo submit task enter"); reportCallInfoQueue.submit([callStatusManagerPtr, voipCallEventInfo]() { - if (callStatusManagerPtr == nullptr) { - TELEPHONY_LOGW("callStatusManagerPtr is nullptr"); - } else { - std::shared_ptr managerPtr = callStatusManagerPtr.lock(); - if (managerPtr == nullptr) { - TELEPHONY_LOGE("managerPtr is null"); - return; - } - int32_t ret = managerPtr->HandleVoipEventReportInfo(voipCallEventInfo); - if (ret != TELEPHONY_SUCCESS) { - TELEPHONY_LOGE("UpdateVoipEventInfo failed! ret:%{public}d", ret); - } + std::shared_ptr managerPtr = callStatusManagerPtr.lock(); + if (managerPtr == nullptr) { + TELEPHONY_LOGE("managerPtr is null"); + return; + } + int32_t ret = managerPtr->HandleVoipEventReportInfo(voipCallEventInfo); + if (ret != TELEPHONY_SUCCESS) { + TELEPHONY_LOGE("UpdateVoipEventInfo failed! ret:%{public}d", ret); } }); return TELEPHONY_SUCCESS; -- Gitee From 3a1a48e02b9e4605428ed614ef3ba1c249fdbdbe Mon Sep 17 00:00:00 2001 From: n00810144 Date: Wed, 11 Dec 2024 11:25:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: n00810144 --- .../napi/src/napi_call_ability_callback.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/js/napi/src/napi_call_ability_callback.cpp b/frameworks/js/napi/src/napi_call_ability_callback.cpp index 170e8934..f39f1a3e 100644 --- a/frameworks/js/napi/src/napi_call_ability_callback.cpp +++ b/frameworks/js/napi/src/napi_call_ability_callback.cpp @@ -734,7 +734,7 @@ int32_t NapiCallAbilityCallback::ReportCallEvent(CallEventInfo &info, EventCallb napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, scopeCallEvent); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -832,7 +832,7 @@ int32_t NapiCallAbilityCallback::ReportDisconnectedCause( napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, disconnectedScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -941,7 +941,7 @@ int32_t NapiCallAbilityCallback::ReportMmiCode(MmiCodeInfo &info, EventCallback napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, mmiCodeScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -1059,7 +1059,7 @@ int32_t NapiCallAbilityCallback::ReportAudioDeviceInfo(AudioDeviceInfo &info, Ev napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, AudioDeviceInfoScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -1837,7 +1837,7 @@ int32_t NapiCallAbilityCallback::ReportCallOtt( napi_get_reference_value(env, settingInfo.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, callOttscope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -2026,7 +2026,7 @@ int32_t NapiCallAbilityCallback::ReportCallMediaModeInfo( napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, CallMediaModeInfoScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -2122,7 +2122,7 @@ int32_t NapiCallAbilityCallback::ReportCallSessionEvent( napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, CallSessionEventScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -2221,7 +2221,7 @@ int32_t NapiCallAbilityCallback::ReportPeerDimensions( napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, PeerDimensionsDetailScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -2312,7 +2312,7 @@ int32_t NapiCallAbilityCallback::ReportCallDataUsage(int64_t dataUsage, EventCal napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, CallDataUsageScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; @@ -2411,7 +2411,7 @@ int32_t NapiCallAbilityCallback::ReportCameraCapabilitiesInfo( napi_get_reference_value(env, eventCallback.thisVar, &thisVar); if (thisVar == nullptr) { TELEPHONY_LOGE("thisVar is null!"); - napi_close_handle_scope(env, scope); + napi_close_handle_scope(env, cameraCapabilitiesScope); return TELEPHONY_ERROR; } napi_value callbackResult = nullptr; -- Gitee