openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-27 10:11:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:add CloseUnFinishedUssd interfaces

Browse Source 
Signed-off-by: wangwei30043812 <wangwei1033@huawei.com>
This commit is contained in:
wangwei30043812 2023-03-03 12:27:36 +08:00
parent 0a83afb31d
commit 6f52f1b6e1
10 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frameworks/native/src/core_manager_inner.cpp
View File

@ -198,6 +198,22 @@ int32_t CoreManagerInner::SetUssd(int32_t slotId, int32_t eventId, const std::st
return telRilManager_->SetUssd(slotId, str, response);
}
int32_t CoreManagerInner::CloseUnFinishedUssd(
int32_t slotId, int32_t eventId, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const
{
if (telRilManager_ == nullptr) {
TELEPHONY_LOGE("telRilManager is null!");
return TELEPHONY_ERR_LOCAL_PTR_NULL;
}
AppExecFwk::InnerEvent::Pointer response = AppExecFwk::InnerEvent::Get(eventId);
if (response == nullptr) {
TELEPHONY_LOGE("response is null!");
return TELEPHONY_ERR_LOCAL_PTR_NULL;
}
response->SetOwner(handler);
return telRilManager_->CloseUnFinishedUssd(slotId, response);
}
int32_t CoreManagerInner::GetUssd(
int32_t slotId, int32_t eventId, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const
{

2
interfaces/innerkits/include/core_manager_inner.h
View File

@ -125,6 +125,8 @@ public:
int32_t SetUssd(int32_t slotId, int32_t eventId, const std::string str,
const std::shared_ptr<AppExecFwk::EventHandler> &handler) const;
int32_t GetUssd(int32_t slotId, int32_t eventId, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const;
int32_t CloseUnFinishedUssd(
int32_t slotId, int32_t eventId, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const;
int32_t GetMute(int32_t slotId, int32_t eventId, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const;
int32_t SetMute(
int32_t slotId, int32_t eventId, int32_t mute, const std::shared_ptr<AppExecFwk::EventHandler> &handler) const;

1
interfaces/innerkits/include/i_tel_ril_manager.h
View File

@ -227,6 +227,7 @@ public:
virtual int32_t GetCallPreferenceMode(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t SetUssd(int32_t slotId, const std::string str, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t GetUssd(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t CloseUnFinishedUssd(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t SetMute(int32_t slotId, const int32_t mute, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t GetMute(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) = 0;
virtual int32_t GetEmergencyCallList(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) = 0;

1
interfaces/innerkits/include/radio_event.h
View File

@ -88,6 +88,7 @@ enum RadioEvent {
RADIO_GET_EMERGENCY_CALL_LIST,
RADIO_SET_EMERGENCY_CALL_LIST,
RADIO_GET_CALL_FAIL_REASON,
RADIO_CLOSE_UNFINISHED_USSD,
// Ims sms
RADIO_SEND_IMS_GSM_SMS = 201,

2
services/tel_ril/include/tel_ril_call.h
View File

@ -67,6 +67,7 @@ public:
int32_t GetCallFailReason(const AppExecFwk::InnerEvent::Pointer &result);
int32_t SetBarringPassword(std::string fac, std::string oldPassword,
std::string newPassword, const AppExecFwk::InnerEvent::Pointer &result);
int32_t CloseUnFinishedUssd(const AppExecFwk::InnerEvent::Pointer &result);
int32_t AnswerResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
int32_t GetCallListResponse(
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallInfoList &callList);
@ -115,6 +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);
private:
void BuildEmergencyInfoList(std::shared_ptr<EmergencyInfoList> emergencyCallList,

1
services/tel_ril/include/tel_ril_callback.h
View File

@ -84,6 +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;
// Data
int32_t PdpContextListUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,

1
services/tel_ril/include/tel_ril_manager.h
View File

@ -261,6 +261,7 @@ public:
int32_t slotId, const ApduSimIORequestInfo &reqInfo, const AppExecFwk::InnerEvent::Pointer &response) override;
int32_t SimAuthentication(int32_t slotId, const SimAuthenticationRequestInfo &reqInfo,
const AppExecFwk::InnerEvent::Pointer &response) override;
int32_t CloseUnFinishedUssd(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response) override;
/**
* Register hdf status listener

11
services/tel_ril/src/tel_ril_call.cpp
View File

@ -296,6 +296,11 @@ 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)
{
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
}
int32_t TelRilCall::GetCallList(const AppExecFwk::InnerEvent::Pointer &result)
{
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_LIST, &HDI::Ril::V1_0::IRil::GetCallList);
@ -508,6 +513,12 @@ int32_t TelRilCall::SetBarringPassword(
&HDI::Ril::V1_0::IRil::SetBarringPassword, setBarringInfo);
}
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);
}
int32_t TelRilCall::CallStateUpdated()
{
return Notify(TELEPHONY_LOG_FUNC_NAME, RadioEvent::RADIO_CALL_STATUS_INFO);

5
services/tel_ril/src/tel_ril_callback.cpp
View File

@ -240,6 +240,11 @@ 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)
{
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CloseUnFinishedUssdResponse);
}
// Data
int32_t TelRilCallback::PdpContextListUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
const HDI::Ril::V1_0::DataCallResultList &dataCallResultList)

5
services/tel_ril/src/tel_ril_manager.cpp
View File

@ -437,6 +437,11 @@ int32_t TelRilManager::GetCallFailReason(int32_t slotId, const AppExecFwk::Inner
return TaskSchedule(response, "TelRilCall", GetTelRilCall(slotId), &TelRilCall::GetCallFailReason);
}
int32_t TelRilManager::CloseUnFinishedUssd(int32_t slotId, const AppExecFwk::InnerEvent::Pointer &response)
{
return TaskSchedule(response, "TelRilCall", GetTelRilCall(slotId), &TelRilCall::CloseUnFinishedUssd);
}
/*********************** TelRilCall end ****************************/
/*********************** TelRilData start **************************/
int32_t TelRilManager::SetInitApnInfo(