From 21f8bed2016e756642a12d1c916bea0cadb7783b Mon Sep 17 00:00:00 2001 From: w00636648 Date: Thu, 16 Mar 2023 21:23:04 +0800 Subject: [PATCH] feat:add CloseUnFinishedUssd interfaces Signed-off-by: w00636648 --- services/tel_ril/include/tel_ril_call.h | 2 +- services/tel_ril/include/tel_ril_callback.h | 2 +- services/tel_ril/src/tel_ril_call.cpp | 4 ++-- services/tel_ril/src/tel_ril_callback.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/tel_ril/include/tel_ril_call.h b/services/tel_ril/include/tel_ril_call.h index a5ddce130..26205ae8c 100644 --- a/services/tel_ril/include/tel_ril_call.h +++ b/services/tel_ril/include/tel_ril_call.h @@ -116,7 +116,7 @@ public: int32_t CallSrvccStatusNotice(const HDI::Ril::V1_0::SrvccStatus &srvccStatus); int32_t CallEmergencyNotice(const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList); int32_t CallRsrvccStatusNotify(); - int32_t CloseUnFinishedUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo); + int32_t CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo); private: void BuildEmergencyInfoList(std::shared_ptr emergencyCallList, diff --git a/services/tel_ril/include/tel_ril_callback.h b/services/tel_ril/include/tel_ril_callback.h index 6a03c7d53..c48083230 100644 --- a/services/tel_ril/include/tel_ril_callback.h +++ b/services/tel_ril/include/tel_ril_callback.h @@ -84,7 +84,7 @@ public: int32_t GetCallFailReasonResponse( const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t callFail) override; int32_t SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override; - int32_t CloseUnFinishedUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override; + int32_t CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override; // Data int32_t PdpContextListUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, diff --git a/services/tel_ril/src/tel_ril_call.cpp b/services/tel_ril/src/tel_ril_call.cpp index 1c12454e5..86e129414 100644 --- a/services/tel_ril/src/tel_ril_call.cpp +++ b/services/tel_ril/src/tel_ril_call.cpp @@ -296,7 +296,7 @@ int32_t TelRilCall::SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadioRes return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo); } -int32_t TelRilCall::CloseUnFinishedUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) +int32_t TelRilCall::CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) { return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo); } @@ -516,7 +516,7 @@ int32_t TelRilCall::SetBarringPassword( int32_t TelRilCall::CloseUnFinishedUssd(const AppExecFwk::InnerEvent::Pointer &result) { return Request( - TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_CLOSE_UNFINISHED_USSD, &HDI::Ril::V1_0::IRil::CloseUnFinishedUssd); + TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_CLOSE_UNFINISHED_USSD, &HDI::Ril::V1_1::IRil::CloseUnFinishedUssd); } int32_t TelRilCall::CallStateUpdated() diff --git a/services/tel_ril/src/tel_ril_callback.cpp b/services/tel_ril/src/tel_ril_callback.cpp index 82b17fc69..a00544193 100644 --- a/services/tel_ril/src/tel_ril_callback.cpp +++ b/services/tel_ril/src/tel_ril_callback.cpp @@ -240,7 +240,7 @@ int32_t TelRilCallback::SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadi return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetBarringPasswordResponse); } -int32_t TelRilCallback::CloseUnFinishedUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) +int32_t TelRilCallback::CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) { return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CloseUnFinishedUssdResponse); }