mirror of
https://gitee.com/openharmony/telephony_core_service
synced 2024-11-23 16:09:48 +00:00
feat:add CloseUnFinishedUssd interfaces
Signed-off-by: w00636648 <wangziming14@huawei.com>
This commit is contained in:
w00636648
parent
fc355607e5
commit
25b5ccb362
79
.vscode/settings.json
vendored
Normal file
79
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,79 @@
|
||||
{
|
||||
"files.associations": {
|
||||
"algorithm": "cpp",
|
||||
"any": "cpp",
|
||||
"array": "cpp",
|
||||
"atomic": "cpp",
|
||||
"bit": "cpp",
|
||||
"cctype": "cpp",
|
||||
"charconv": "cpp",
|
||||
"chrono": "cpp",
|
||||
"cinttypes": "cpp",
|
||||
"clocale": "cpp",
|
||||
"cmath": "cpp",
|
||||
"codecvt": "cpp",
|
||||
"compare": "cpp",
|
||||
"concepts": "cpp",
|
||||
"condition_variable": "cpp",
|
||||
"cstddef": "cpp",
|
||||
"cstdint": "cpp",
|
||||
"cstdio": "cpp",
|
||||
"cstdlib": "cpp",
|
||||
"cstring": "cpp",
|
||||
"ctime": "cpp",
|
||||
"cwchar": "cpp",
|
||||
"exception": "cpp",
|
||||
"format": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"fstream": "cpp",
|
||||
"functional": "cpp",
|
||||
"initializer_list": "cpp",
|
||||
"iomanip": "cpp",
|
||||
"ios": "cpp",
|
||||
"iosfwd": "cpp",
|
||||
"iostream": "cpp",
|
||||
"istream": "cpp",
|
||||
"iterator": "cpp",
|
||||
"limits": "cpp",
|
||||
"list": "cpp",
|
||||
"locale": "cpp",
|
||||
"map": "cpp",
|
||||
"memory": "cpp",
|
||||
"mutex": "cpp",
|
||||
"new": "cpp",
|
||||
"optional": "cpp",
|
||||
"ostream": "cpp",
|
||||
"ratio": "cpp",
|
||||
"regex": "cpp",
|
||||
"set": "cpp",
|
||||
"sstream": "cpp",
|
||||
"stdexcept": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"streambuf": "cpp",
|
||||
"string": "cpp",
|
||||
"system_error": "cpp",
|
||||
"thread": "cpp",
|
||||
"tuple": "cpp",
|
||||
"type_traits": "cpp",
|
||||
"typeinfo": "cpp",
|
||||
"unordered_map": "cpp",
|
||||
"utility": "cpp",
|
||||
"vector": "cpp",
|
||||
"xfacet": "cpp",
|
||||
"xhash": "cpp",
|
||||
"xiosbase": "cpp",
|
||||
"xlocale": "cpp",
|
||||
"xlocbuf": "cpp",
|
||||
"xlocinfo": "cpp",
|
||||
"xlocmes": "cpp",
|
||||
"xlocmon": "cpp",
|
||||
"xlocnum": "cpp",
|
||||
"xloctime": "cpp",
|
||||
"xmemory": "cpp",
|
||||
"xstddef": "cpp",
|
||||
"xstring": "cpp",
|
||||
"xtr1common": "cpp",
|
||||
"xtree": "cpp",
|
||||
"xutility": "cpp"
|
||||
}
|
||||
}
|
||||
@ -32,7 +32,7 @@
|
||||
#include "telephony_errors.h"
|
||||
#include "telephony_log_wrapper.h"
|
||||
#include "telephony_types.h"
|
||||
#include "v1_0/iril.h"
|
||||
#include "v1_1/iril.h"
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
@ -53,13 +53,13 @@ private:
|
||||
|
||||
class TelRilBase {
|
||||
public:
|
||||
TelRilBase(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilBase(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler);
|
||||
virtual ~TelRilBase() = default;
|
||||
|
||||
static std::shared_ptr<TelRilRequest> CreateTelRilRequest(
|
||||
int32_t request, const AppExecFwk::InnerEvent::Pointer &result);
|
||||
void ResetRilInterface(sptr<HDI::Ril::V1_0::IRil> rilInterface);
|
||||
void ResetRilInterface(sptr<HDI::Ril::V1_1::IRil> rilInterface);
|
||||
static std::shared_ptr<TelRilRequest> FindTelRilRequest(const HRilRadioResponseInfo &responseInfo);
|
||||
int32_t ErrorResponse(std::shared_ptr<TelRilRequest> telRilRequest, const HRilRadioResponseInfo &responseInfo);
|
||||
|
||||
@ -67,18 +67,18 @@ protected:
|
||||
template<typename FuncType, typename... ParamTypes>
|
||||
inline int32_t Request(const char *funcName, const AppExecFwk::InnerEvent::Pointer &response, int32_t requestId,
|
||||
FuncType &&_func, ParamTypes &&... _args);
|
||||
inline HRilRadioResponseInfo BuildHRilRadioResponseInfo(const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo);
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo);
|
||||
inline HRilRadioResponseInfo BuildHRilRadioResponseInfo(const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo);
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo);
|
||||
template<typename T>
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo, T data);
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, T data);
|
||||
template<typename T>
|
||||
inline int32_t Response(
|
||||
const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo, std::shared_ptr<T> data);
|
||||
const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::shared_ptr<T> data);
|
||||
template<typename T>
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo,
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo,
|
||||
std::function<std::shared_ptr<T>(std::shared_ptr<TelRilRequest>)> getDataFunc);
|
||||
template<typename T>
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo,
|
||||
inline int32_t Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo,
|
||||
std::function<T(std::shared_ptr<TelRilRequest>)> getDataFunc);
|
||||
inline int32_t Notify(const char *funcName, RadioEvent notifyId);
|
||||
template<typename T>
|
||||
@ -88,7 +88,7 @@ protected:
|
||||
|
||||
protected:
|
||||
std::shared_ptr<ObserverHandler> observerHandler_;
|
||||
sptr<HDI::Ril::V1_0::IRil> rilInterface_;
|
||||
sptr<HDI::Ril::V1_1::IRil> rilInterface_;
|
||||
int32_t slotId_;
|
||||
|
||||
private:
|
||||
@ -125,7 +125,7 @@ inline int32_t TelRilBase::Request(const char *funcName, const AppExecFwk::Inner
|
||||
return (rilInterface_->*(_func))(slotId_, telRilRequest->serialId_, std::forward<ParamTypes>(_args)...);
|
||||
}
|
||||
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo)
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo)
|
||||
{
|
||||
auto getDataFunc = [&iResponseInfo](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<HRilRadioResponseInfo> result = std::make_shared<HRilRadioResponseInfo>();
|
||||
@ -139,7 +139,7 @@ inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_0::
|
||||
|
||||
template<typename T>
|
||||
inline int32_t TelRilBase::Response(
|
||||
const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo, T data)
|
||||
const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, T data)
|
||||
{
|
||||
auto getDataFunc = [data](std::shared_ptr<TelRilRequest> telRilRequest) { return data; };
|
||||
return Response<T>(funcName, iResponseInfo, getDataFunc);
|
||||
@ -147,7 +147,7 @@ inline int32_t TelRilBase::Response(
|
||||
|
||||
template<typename T>
|
||||
inline int32_t TelRilBase::Response(
|
||||
const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo, std::shared_ptr<T> data)
|
||||
const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo, std::shared_ptr<T> data)
|
||||
{
|
||||
if (data == nullptr) {
|
||||
TELEPHONY_LOGE("Response func %{public}s data is null", funcName);
|
||||
@ -158,14 +158,14 @@ inline int32_t TelRilBase::Response(
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo,
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo,
|
||||
std::function<std::shared_ptr<T>(std::shared_ptr<TelRilRequest>)> getDataFunc)
|
||||
{
|
||||
return Response<std::shared_ptr<T>>(funcName, iResponseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo,
|
||||
inline int32_t TelRilBase::Response(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo,
|
||||
std::function<T(std::shared_ptr<TelRilRequest>)> getDataFunc)
|
||||
{
|
||||
const auto &radioResponseInfo = BuildHRilRadioResponseInfo(iResponseInfo);
|
||||
@ -228,7 +228,7 @@ inline int32_t TelRilBase::Notify(const char *funcName, RadioEvent notifyId)
|
||||
}
|
||||
|
||||
inline HRilRadioResponseInfo TelRilBase::BuildHRilRadioResponseInfo(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo)
|
||||
{
|
||||
HRilRadioResponseInfo responseInfo = { 0 };
|
||||
responseInfo.flag = iResponseInfo.flag;
|
||||
|
||||
@ -23,7 +23,7 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilCall : public TelRilBase {
|
||||
public:
|
||||
TelRilCall(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilCall(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilCall() = default;
|
||||
|
||||
@ -68,64 +68,64 @@ public:
|
||||
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 AnswerResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallListResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallInfoList &callList);
|
||||
int32_t DialResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t HangupResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t RejectResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t HoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UnHoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SwitchCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t CombineConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SeparateConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t CallSupplementResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallInfoList &callList);
|
||||
int32_t DialResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t HangupResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t RejectResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t HoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UnHoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SwitchCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t CombineConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SeparateConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t CallSupplementResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallWaitingResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallWaitResult &callWaitResult);
|
||||
int32_t SetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallWaitResult &callWaitResult);
|
||||
int32_t SetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList);
|
||||
int32_t GetClipResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClipResult &getClipResult);
|
||||
int32_t SetClipResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClipResult &getClipResult);
|
||||
int32_t SetClipResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetClirResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClirResult &getClirResult);
|
||||
int32_t SetClirResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClirResult &getClirResult);
|
||||
int32_t SetClirResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallRestrictionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallRestrictionResult &result);
|
||||
int32_t SetCallRestrictionResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetCallWaitingResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SendDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t StartDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t StopDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetCallPreferenceModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallPreferenceModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mode);
|
||||
int32_t SetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t cusd);
|
||||
int32_t SetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mute);
|
||||
int32_t GetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList);
|
||||
int32_t SetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallFailReasonResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t callFail);
|
||||
int32_t SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallRestrictionResult &result);
|
||||
int32_t SetCallRestrictionResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetCallWaitingResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SendDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t StartDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t StopDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetCallPreferenceModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallPreferenceModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mode);
|
||||
int32_t SetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t cusd);
|
||||
int32_t SetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mute);
|
||||
int32_t GetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList);
|
||||
int32_t SetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCallFailReasonResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t callFail);
|
||||
int32_t SetBarringPasswordResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t CallStateUpdated();
|
||||
int32_t CallUssdNotice(const HDI::Ril::V1_0::UssdNoticeInfo &ussdNoticeInfo);
|
||||
int32_t CallSsNotice(const HDI::Ril::V1_0::SsNoticeInfo &ssNoticeInfo);
|
||||
int32_t CallRingbackVoiceNotice(const HDI::Ril::V1_0::RingbackVoice &ringbackVoice);
|
||||
int32_t CallSrvccStatusNotice(const HDI::Ril::V1_0::SrvccStatus &srvccStatus);
|
||||
int32_t CallEmergencyNotice(const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList);
|
||||
int32_t CallUssdNotice(const HDI::Ril::V1_1::UssdNoticeInfo &ussdNoticeInfo);
|
||||
int32_t CallSsNotice(const HDI::Ril::V1_1::SsNoticeInfo &ssNoticeInfo);
|
||||
int32_t CallRingbackVoiceNotice(const HDI::Ril::V1_1::RingbackVoice &ringbackVoice);
|
||||
int32_t CallSrvccStatusNotice(const HDI::Ril::V1_1::SrvccStatus &srvccStatus);
|
||||
int32_t CallEmergencyNotice(const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList);
|
||||
int32_t CallRsrvccStatusNotify();
|
||||
int32_t CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
|
||||
private:
|
||||
void BuildEmergencyInfoList(std::shared_ptr<EmergencyInfoList> emergencyCallList,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList);
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList);
|
||||
void BuildCallInfoList(std::shared_ptr<CallInfoList> callInfoList,
|
||||
const HDI::Ril::V1_0::CallInfoList &iCallInfoList);
|
||||
const HDI::Ril::V1_1::CallInfoList &iCallInfoList);
|
||||
void BuildCFQueryInfoList(std::shared_ptr<CallForwardQueryInfoList> cFQueryInfoList,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList);
|
||||
int32_t ResponseSupplement(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo);
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList);
|
||||
int32_t ResponseSupplement(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo);
|
||||
};
|
||||
} // namespace Telephony
|
||||
} // namespace OHOS
|
||||
|
||||
@ -16,261 +16,261 @@
|
||||
#ifndef TEL_RIL_CALLBACK_H
|
||||
#define TEL_RIL_CALLBACK_H
|
||||
|
||||
#include <v1_0/iril.h>
|
||||
#include <v1_1/iril.h>
|
||||
|
||||
#include "tel_ril_manager.h"
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilCallback : public HDI::Ril::V1_0::IRilCallback {
|
||||
class TelRilCallback : public HDI::Ril::V1_1::IRilCallback {
|
||||
public:
|
||||
explicit TelRilCallback(std::shared_ptr<TelRilManager> telRilManager);
|
||||
~TelRilCallback() = default;
|
||||
|
||||
// Call
|
||||
int32_t CallEmergencyNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList) override;
|
||||
int32_t CallStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CallRingbackVoiceNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::RingbackVoice &ringbackVoice) override;
|
||||
int32_t CallSrvccStatusNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SrvccStatus &srvccStatus) override;
|
||||
int32_t CallUssdNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::UssdNoticeInfo &ussdNoticeInfo) override;
|
||||
int32_t CallSsNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SsNoticeInfo &ssNoticeInfo) override;
|
||||
int32_t CallRsrvccStatusNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CallEmergencyNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList) override;
|
||||
int32_t CallStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CallRingbackVoiceNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::RingbackVoice &ringbackVoice) override;
|
||||
int32_t CallSrvccStatusNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SrvccStatus &srvccStatus) override;
|
||||
int32_t CallUssdNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::UssdNoticeInfo &ussdNoticeInfo) override;
|
||||
int32_t CallSsNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SsNoticeInfo &ssNoticeInfo) override;
|
||||
int32_t CallRsrvccStatusNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
|
||||
int32_t SetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList) override;
|
||||
int32_t GetCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallInfoList &callList) override;
|
||||
int32_t DialResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t HangupResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t RejectResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t AnswerResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t HoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UnHoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SwitchCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetClipResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::GetClipResult &getClipResult) override;
|
||||
int32_t SetClipResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CombineConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SeparateConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CallSupplementResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallWaitingResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallWaitResult &callWaitResult) override;
|
||||
int32_t SetCallWaitingResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList) override;
|
||||
int32_t SetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallRestrictionResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallRestrictionResult &result) override;
|
||||
int32_t SetCallRestrictionResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetClirResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::GetClirResult &getClirResult) override;
|
||||
int32_t SetClirResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t StartDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SendDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t StopDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList) override;
|
||||
int32_t GetCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallInfoList &callList) override;
|
||||
int32_t DialResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t HangupResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t RejectResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t AnswerResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t HoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UnHoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SwitchCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetClipResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::GetClipResult &getClipResult) override;
|
||||
int32_t SetClipResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CombineConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SeparateConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CallSupplementResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallWaitingResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallWaitResult &callWaitResult) override;
|
||||
int32_t SetCallWaitingResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList) override;
|
||||
int32_t SetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallRestrictionResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallRestrictionResult &result) override;
|
||||
int32_t SetCallRestrictionResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetClirResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::GetClirResult &getClirResult) override;
|
||||
int32_t SetClirResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t StartDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SendDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t StopDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCallPreferenceModeResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mode) override;
|
||||
int32_t SetCallPreferenceModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t cusd) override;
|
||||
int32_t SetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mute) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mode) override;
|
||||
int32_t SetCallPreferenceModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t cusd) override;
|
||||
int32_t SetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mute) override;
|
||||
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;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t callFail) override;
|
||||
int32_t SetBarringPasswordResponse(const HDI::Ril::V1_1::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,
|
||||
const HDI::Ril::V1_0::DataCallResultList &dataCallResultList) override;
|
||||
int32_t ActivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &setupDataCallResultInfo) override;
|
||||
int32_t DeactivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetPdpContextListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataCallResultList &dataCallResultList) override;
|
||||
int32_t SetInitApnInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetLinkBandwidthInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &dataLinkBandwidthInfo) override;
|
||||
int32_t SetDataPermittedResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t PdpContextListUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &dataCallResultList) override;
|
||||
int32_t ActivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &setupDataCallResultInfo) override;
|
||||
int32_t DeactivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetPdpContextListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &dataCallResultList) override;
|
||||
int32_t SetInitApnInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetLinkBandwidthInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &dataLinkBandwidthInfo) override;
|
||||
int32_t SetDataPermittedResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
|
||||
// Modem
|
||||
int32_t RadioStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state) override;
|
||||
int32_t VoiceRadioTechUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology) override;
|
||||
int32_t ShutDownResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state) override;
|
||||
int32_t GetImeiResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &imei) override;
|
||||
int32_t GetMeidResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &meid) override;
|
||||
int32_t GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology) override;
|
||||
int32_t RadioStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state) override;
|
||||
int32_t VoiceRadioTechUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology) override;
|
||||
int32_t ShutDownResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state) override;
|
||||
int32_t GetImeiResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &imei) override;
|
||||
int32_t GetMeidResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &meid) override;
|
||||
int32_t GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology) override;
|
||||
int32_t GetBasebandVersionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion) override;
|
||||
|
||||
// sim notice
|
||||
int32_t SimStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSessionEndNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSessionEndNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkProactiveNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
int32_t SimStkAlphaNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
int32_t SimStkEventNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
int32_t SimStkCallSetupNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimRefreshNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimRadioProtocolUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::RadioProtocol &radioProtocol) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
int32_t SimStkCallSetupNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimRefreshNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimRadioProtocolUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::RadioProtocol &radioProtocol) override;
|
||||
|
||||
// sim response
|
||||
int32_t GetSimIOResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::IccIoResultInfo &result) override;
|
||||
int32_t GetSimStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CardStatusInfo &result) override;
|
||||
int32_t GetSimIOResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::IccIoResultInfo &result) override;
|
||||
int32_t GetSimStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CardStatusInfo &result) override;
|
||||
int32_t GetImsiResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response) override;
|
||||
int32_t GetSimLockStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t simLockStatus) override;
|
||||
int32_t SetSimLockResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t ChangeSimPasswordResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPinResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPukResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPin2Response(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPuk2Response(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
int32_t SetActiveSimResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendTerminalResponseResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendEnvelopeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkIsReadyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetRadioProtocolResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::RadioProtocol &radioProtocol) override;
|
||||
int32_t SetRadioProtocolResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::RadioProtocol &radioProtocol) override;
|
||||
int32_t SimOpenLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse) override;
|
||||
int32_t SimCloseLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimTransmitApduLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::IccIoResultInfo &result) override;
|
||||
int32_t SimTransmitApduBasicChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::IccIoResultInfo &result) override;
|
||||
int32_t SimAuthenticationResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::IccIoResultInfo &result) override;
|
||||
int32_t UnlockSimLockResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::LockStatusResp &lockStatus) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t simLockStatus) override;
|
||||
int32_t SetSimLockResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t ChangeSimPasswordResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPinResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPukResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPin2Response(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t UnlockPuk2Response(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
int32_t SetActiveSimResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendTerminalResponseResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendEnvelopeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimStkIsReadyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetRadioProtocolResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::RadioProtocol &radioProtocol) override;
|
||||
int32_t SetRadioProtocolResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::RadioProtocol &radioProtocol) override;
|
||||
int32_t SimOpenLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse) override;
|
||||
int32_t SimCloseLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SimTransmitApduLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::IccIoResultInfo &result) override;
|
||||
int32_t SimTransmitApduBasicChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::IccIoResultInfo &result) override;
|
||||
int32_t SimAuthenticationResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::IccIoResultInfo &result) override;
|
||||
int32_t UnlockSimLockResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::LockStatusResp &lockStatus) override;
|
||||
|
||||
// Network
|
||||
int32_t NetworkCsRegStatusUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo) override;
|
||||
int32_t NetworkPsRegStatusUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo) override;
|
||||
int32_t NetworkCsRegStatusUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo) override;
|
||||
int32_t NetworkPsRegStatusUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo) override;
|
||||
int32_t SignalStrengthUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi) override;
|
||||
int32_t NetworkTimeZoneUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &timeZoneStr) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &timeZoneStr) override;
|
||||
int32_t NetworkTimeUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &timeStr) override;
|
||||
int32_t NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList) override;
|
||||
int32_t NetworkCurrentCellUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListCurrentInfo &cellListCurrentInfo) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &timeStr) override;
|
||||
int32_t NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList) override;
|
||||
int32_t NetworkCurrentCellUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListCurrentInfo &cellListCurrentInfo) override;
|
||||
int32_t GetSignalStrengthResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi) override;
|
||||
int32_t GetCsRegStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo) override;
|
||||
int32_t GetPsRegStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo) override;
|
||||
int32_t GetOperatorInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::OperatorInfo &operatorInfo) override;
|
||||
int32_t GetNetworkSearchInformationResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList) override;
|
||||
int32_t GetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo) override;
|
||||
int32_t SetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetNeighboringCellInfoListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList) override;
|
||||
int32_t GetCurrentCellInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList) override;
|
||||
int32_t SetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PreferredNetworkTypeInfo &preferredNetworkTypeInfo) override;
|
||||
int32_t GetPhysicalChannelConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList) override;
|
||||
int32_t SetLocateUpdatesResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetNotificationFilterResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetDeviceStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi) override;
|
||||
int32_t GetCsRegStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo) override;
|
||||
int32_t GetPsRegStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo) override;
|
||||
int32_t GetOperatorInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::OperatorInfo &operatorInfo) override;
|
||||
int32_t GetNetworkSearchInformationResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList) override;
|
||||
int32_t GetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo) override;
|
||||
int32_t SetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetNeighboringCellInfoListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList) override;
|
||||
int32_t GetCurrentCellInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList) override;
|
||||
int32_t SetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PreferredNetworkTypeInfo &preferredNetworkTypeInfo) override;
|
||||
int32_t GetPhysicalChannelConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList) override;
|
||||
int32_t SetLocateUpdatesResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetNotificationFilterResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetDeviceStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
|
||||
// Sms
|
||||
int32_t NewSmsNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t NewCdmaSmsNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t SmsStatusReportNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t NewSmsStoredOnSimNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t recordNumber,
|
||||
int32_t NewSmsNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t NewCdmaSmsNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t SmsStatusReportNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo) override;
|
||||
int32_t NewSmsStoredOnSimNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t recordNumber,
|
||||
int32_t indicationType) override;
|
||||
int32_t CBConfigNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CBConfigReportInfo &cellBroadConfigReportInfo) override;
|
||||
int32_t SendGsmSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t SendCdmaSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t AddSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t DelSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UpdateSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t AddCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t DelCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UpdateCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &serviceCenterAddress) override;
|
||||
int32_t SetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CBConfigInfo &cellBroadcastInfo) override;
|
||||
int32_t SetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CdmaCBConfigInfo &cdmaCBConfigInfo) override;
|
||||
int32_t SendSmsMoreModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t SendSmsAckResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CBConfigNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CBConfigReportInfo &cellBroadConfigReportInfo) override;
|
||||
int32_t SendGsmSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t SendCdmaSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t AddSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t DelSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UpdateSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t AddCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t DelCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t UpdateCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t SetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &serviceCenterAddress) override;
|
||||
int32_t SetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CBConfigInfo &cellBroadcastInfo) override;
|
||||
int32_t SetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t GetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CdmaCBConfigInfo &cdmaCBConfigInfo) override;
|
||||
int32_t SendSmsMoreModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo) override;
|
||||
int32_t SendSmsAckResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
|
||||
int32_t CommonErrorResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo) override;
|
||||
int32_t CommonErrorResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo) override;
|
||||
|
||||
private:
|
||||
template<typename FuncType, typename ModuleFuncType, typename... ParamTypes>
|
||||
inline int32_t Response(const HDI::Ril::V1_0::RilRadioResponseInfo responseInfo, FuncType &&_func,
|
||||
inline int32_t Response(const HDI::Ril::V1_1::RilRadioResponseInfo responseInfo, FuncType &&_func,
|
||||
ModuleFuncType _moduleFunc, ParamTypes &&... _args) const
|
||||
{
|
||||
if (telRilManager_ == nullptr) {
|
||||
TELEPHONY_LOGE("telRilManager_ is nullptr");
|
||||
return TELEPHONY_ERR_LOCAL_PTR_NULL;
|
||||
}
|
||||
if (responseInfo.type == HDI::Ril::V1_0::RilResponseTypes::RIL_RESPONSE_REQUEST_MUST_ACK) {
|
||||
if (responseInfo.type == HDI::Ril::V1_1::RilResponseTypes::RIL_RESPONSE_REQUEST_MUST_ACK) {
|
||||
telRilManager_->SendAckAndLock();
|
||||
}
|
||||
return TaskSchedule(responseInfo.slotId, _func, _moduleFunc, responseInfo, std::forward<ParamTypes>(_args)...);
|
||||
}
|
||||
|
||||
template<typename FuncType, typename ModuleFuncType, typename... ParamTypes>
|
||||
inline int32_t Notify(const HDI::Ril::V1_0::RilRadioResponseInfo responseInfo, FuncType &&_func,
|
||||
inline int32_t Notify(const HDI::Ril::V1_1::RilRadioResponseInfo responseInfo, FuncType &&_func,
|
||||
ModuleFuncType _moduleFunc, ParamTypes &&... _args) const
|
||||
{
|
||||
if (telRilManager_ == nullptr) {
|
||||
TELEPHONY_LOGE("telRilManager_ is nullptr");
|
||||
return TELEPHONY_ERR_LOCAL_PTR_NULL;
|
||||
}
|
||||
if (responseInfo.type == HDI::Ril::V1_0::RilResponseTypes::RIL_RESPONSE_NOTICE_MUST_ACK) {
|
||||
if (responseInfo.type == HDI::Ril::V1_1::RilResponseTypes::RIL_RESPONSE_NOTICE_MUST_ACK) {
|
||||
telRilManager_->SendAckAndLock();
|
||||
}
|
||||
return TaskSchedule(responseInfo.slotId, _func, _moduleFunc, std::forward<ParamTypes>(_args)...);
|
||||
|
||||
@ -24,43 +24,43 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilData : public TelRilBase {
|
||||
public:
|
||||
TelRilData(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilData(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilData() = default;
|
||||
|
||||
HDI::Ril::V1_0::DataProfileDataInfo ChangeDPToHalDataProfile(DataProfile dataProfile);
|
||||
HDI::Ril::V1_1::DataProfileDataInfo ChangeDPToHalDataProfile(DataProfile dataProfile);
|
||||
int32_t DeactivatePdpContext(int32_t cid, int32_t reason, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t DeactivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t DeactivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetInitApnInfo(const DataProfile &dataProfile, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t SetInitApnInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetInitApnInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t ActivatePdpContext(int32_t radioTechnology, DataProfile dataProfile, bool isRoaming, bool allowRoaming,
|
||||
const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t ActivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &iSetupDataCallResultInfo);
|
||||
int32_t ActivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &iSetupDataCallResultInfo);
|
||||
int32_t GetPdpContextList(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetPdpContextListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList);
|
||||
int32_t PdpContextListUpdated(const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList);
|
||||
int32_t GetPdpContextListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList);
|
||||
int32_t PdpContextListUpdated(const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList);
|
||||
bool IsDataRespOrNotify(uint32_t code);
|
||||
int32_t GetLinkBandwidthInfo(const int32_t cid, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetLinkBandwidthInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &iDataLinkBandwidthInfo);
|
||||
int32_t GetLinkBandwidthInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &iDataLinkBandwidthInfo);
|
||||
int32_t SetLinkBandwidthReportingRule(
|
||||
LinkBandwidthRule linkBandwidth, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetDataPermitted(const int32_t dataPermitted, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t SetDataPermittedResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetDataPermittedResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
|
||||
private:
|
||||
bool IsDataResponse(uint32_t code);
|
||||
bool IsDataNotification(uint32_t code);
|
||||
void DataResponseError(HRilErrType errCode, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
void BuildDataCallResultList(std::shared_ptr<DataCallResultList> dataCallResultList,
|
||||
const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList);
|
||||
const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList);
|
||||
void BuildDataCallResultInfo(std::shared_ptr<SetupDataCallResultInfo> dataCallResult,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &iSetupDataCallResultInfo);
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &iSetupDataCallResultInfo);
|
||||
void BuildDataLinkBandwidthInfo(std::shared_ptr<DataLinkBandwidthInfo> dataLinkBandwidthInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &iDataLinkBandwidthInfo);
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &iDataLinkBandwidthInfo);
|
||||
|
||||
private:
|
||||
std::mutex responseErrorLock_;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#define TEL_RIL_MANAGER_H
|
||||
|
||||
#include <singleton.h>
|
||||
#include <v1_0/iril.h>
|
||||
#include <v1_1/iril.h>
|
||||
|
||||
#include "hdf_service_status_listener.h"
|
||||
#include "i_tel_ril_manager.h"
|
||||
@ -343,7 +343,7 @@ private:
|
||||
std::shared_ptr<TelRilHandler> handler_ = nullptr;
|
||||
sptr<OHOS::HDI::ServiceManager::V1_0::IServiceManager> servMgr_ = nullptr;
|
||||
sptr<HdfServiceStatusListener::IServStatListener> hdfListener_ = nullptr;
|
||||
sptr<HDI::Ril::V1_0::IRil> rilInterface_ = nullptr;
|
||||
sptr<HDI::Ril::V1_1::IRil> rilInterface_ = nullptr;
|
||||
};
|
||||
} // namespace Telephony
|
||||
} // namespace OHOS
|
||||
|
||||
@ -24,34 +24,34 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilModem : public TelRilBase {
|
||||
public:
|
||||
TelRilModem(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilModem(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilModem() = default;
|
||||
|
||||
int32_t SetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state);
|
||||
int32_t SetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state);
|
||||
int32_t ShutDown(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t ShutDownResponse(const HDI::Ril::V1_0::RilRadioResponseInfo responseInfo);
|
||||
int32_t ShutDownResponse(const HDI::Ril::V1_1::RilRadioResponseInfo responseInfo);
|
||||
int32_t RadioStateUpdated(int32_t state);
|
||||
int32_t VoiceRadioTechUpdated(const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology);
|
||||
int32_t VoiceRadioTechUpdated(const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology);
|
||||
int32_t SetRadioState(int32_t fun, int32_t rst, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetRadioState(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetImei(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetMeid(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetVoiceRadioTechnology(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetBasebandVersion(const AppExecFwk::InnerEvent::Pointer &response);
|
||||
int32_t GetImeiResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &imei);
|
||||
int32_t GetMeidResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &meid);
|
||||
int32_t GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology);
|
||||
int32_t GetImeiResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &imei);
|
||||
int32_t GetMeidResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &meid);
|
||||
int32_t GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology);
|
||||
int32_t GetBasebandVersionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion);
|
||||
|
||||
public:
|
||||
ModemPowerState radioState_ = ModemPowerState::CORE_SERVICE_POWER_NOT_AVAILABLE;
|
||||
|
||||
private:
|
||||
void BuildVoiceRadioTechnology(const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology,
|
||||
void BuildVoiceRadioTechnology(const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology,
|
||||
std::shared_ptr<VoiceRadioTechnology> &mVoiceRadioTechnology);
|
||||
};
|
||||
} // namespace Telephony
|
||||
|
||||
@ -23,7 +23,7 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilNetwork : public TelRilBase {
|
||||
public:
|
||||
TelRilNetwork(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilNetwork(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilNetwork() = default;
|
||||
|
||||
@ -47,72 +47,72 @@ public:
|
||||
int32_t deviceStateType, bool deviceStateOn, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
|
||||
// ril unsol
|
||||
int32_t SignalStrengthUpdated(const HDI::Ril::V1_0::Rssi &rssi);
|
||||
int32_t NetworkCsRegStatusUpdated(const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo);
|
||||
int32_t NetworkPsRegStatusUpdated(const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo);
|
||||
int32_t SignalStrengthUpdated(const HDI::Ril::V1_1::Rssi &rssi);
|
||||
int32_t NetworkCsRegStatusUpdated(const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo);
|
||||
int32_t NetworkPsRegStatusUpdated(const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo);
|
||||
int32_t NetworkTimeZoneUpdated(const std::string &timeZoneStr);
|
||||
int32_t NetworkTimeUpdated(const std::string &timeStr);
|
||||
int32_t NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList);
|
||||
int32_t NetworkCurrentCellUpdated(const HDI::Ril::V1_0::CellListCurrentInfo &cellListCurrentInfo);
|
||||
int32_t NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList);
|
||||
int32_t NetworkCurrentCellUpdated(const HDI::Ril::V1_1::CellListCurrentInfo &cellListCurrentInfo);
|
||||
|
||||
int32_t GetSignalStrengthResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi);
|
||||
int32_t GetCsRegStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo);
|
||||
int32_t GetPsRegStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi);
|
||||
int32_t GetCsRegStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo);
|
||||
int32_t GetPsRegStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo);
|
||||
int32_t GetOperatorInfoResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::OperatorInfo &operatorInfo);
|
||||
int32_t GetNetworkSearchInformationResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList);
|
||||
int32_t GetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo);
|
||||
int32_t SetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetNeighboringCellInfoListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList);
|
||||
int32_t GetCurrentCellInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList);
|
||||
int32_t SetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PreferredNetworkTypeInfo &preferredNetworkTypeInfo);
|
||||
int32_t GetPhysicalChannelConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList);
|
||||
int32_t SetLocateUpdatesResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetNotificationFilterResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetDeviceStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::OperatorInfo &operatorInfo);
|
||||
int32_t GetNetworkSearchInformationResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList);
|
||||
int32_t GetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo);
|
||||
int32_t SetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetNeighboringCellInfoListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList);
|
||||
int32_t GetCurrentCellInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList);
|
||||
int32_t SetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PreferredNetworkTypeInfo &preferredNetworkTypeInfo);
|
||||
int32_t GetPhysicalChannelConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList);
|
||||
int32_t SetLocateUpdatesResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetNotificationFilterResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetDeviceStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
|
||||
private:
|
||||
void BuildSignalStrength(std::shared_ptr<Rssi> signalStrength, const HDI::Ril::V1_0::Rssi &rssi);
|
||||
void BuildSignalStrength(std::shared_ptr<Rssi> signalStrength, const HDI::Ril::V1_1::Rssi &rssi);
|
||||
void BuildCsRegStatusInfo(
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo, const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo);
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo, const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo);
|
||||
void BuildPsRegStatusInfo(
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo, const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo);
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo, const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo);
|
||||
void BuildOperatorInfo(
|
||||
std::shared_ptr<OperatorInfoResult> operatorInfoResult, const HDI::Ril::V1_0::OperatorInfo &operatorInfo);
|
||||
std::shared_ptr<OperatorInfoResult> operatorInfoResult, const HDI::Ril::V1_1::OperatorInfo &operatorInfo);
|
||||
void BuildAvailableNetworkList(std::shared_ptr<AvailableNetworkList> availableNetworkInfos,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList);
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList);
|
||||
void BuildNetworkModeInfo(std::shared_ptr<SetNetworkModeInfo> networkModeInfo,
|
||||
const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo);
|
||||
const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo);
|
||||
void BuildNeighboringCellInfoList(std::shared_ptr<CellListNearbyInfo> cellListNearbyInfo,
|
||||
const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList);
|
||||
void FillGsmCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillLteCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillWcdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillCdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillTdscdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillNrCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
void FillCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info);
|
||||
const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList);
|
||||
void FillGsmCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillLteCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillWcdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillCdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillTdscdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillNrCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void FillCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info);
|
||||
void BuildCurrentCellInfoList(std::shared_ptr<CellListCurrentInfo> currentCellList,
|
||||
const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList);
|
||||
void FillCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillGsmCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillLteCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillWcdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillCdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillTdscdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
void FillNrCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info);
|
||||
const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList);
|
||||
void FillCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillGsmCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillLteCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillWcdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillCdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillTdscdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void FillNrCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info);
|
||||
void BuildChannelConfigInfoList(std::shared_ptr<ChannelConfigInfoList> channelConfigList,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList);
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList);
|
||||
};
|
||||
} // namespace Telephony
|
||||
} // namespace OHOS
|
||||
|
||||
@ -24,7 +24,7 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilSim : public TelRilBase {
|
||||
public:
|
||||
TelRilSim(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface, std::shared_ptr<ObserverHandler> observerHandler,
|
||||
TelRilSim(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface, std::shared_ptr<ObserverHandler> observerHandler,
|
||||
std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilSim() = default;
|
||||
|
||||
@ -35,7 +35,7 @@ public:
|
||||
int32_t SimStkEventNotify(const std::string &response);
|
||||
int32_t SimStkCallSetupNotify();
|
||||
int32_t SimRefreshNotify();
|
||||
int32_t SimRadioProtocolUpdated(const HDI::Ril::V1_0::RadioProtocol &radioProtocol);
|
||||
int32_t SimRadioProtocolUpdated(const HDI::Ril::V1_1::RadioProtocol &radioProtocol);
|
||||
|
||||
int32_t GetSimStatus(const AppExecFwk::InnerEvent::Pointer &result);
|
||||
int32_t GetImsi(const AppExecFwk::InnerEvent::Pointer &result);
|
||||
@ -67,62 +67,62 @@ public:
|
||||
int32_t UnlockSimLock(int32_t lockType, std::string password, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
|
||||
int32_t GetSimStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CardStatusInfo &result);
|
||||
int32_t GetImsiResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result);
|
||||
int32_t GetImsiResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &result);
|
||||
int32_t GetSimIOResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
int32_t GetSimLockStatusResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t simLockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
int32_t GetSimLockStatusResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t simLockStatus);
|
||||
int32_t SetSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t ChangeSimPasswordResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t UnlockPinResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t UnlockPukResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t UnlockPin2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t UnlockPuk2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
int32_t SetActiveSimResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendTerminalResponseResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendEnvelopeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkIsReadyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
int32_t SetActiveSimResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendTerminalResponseResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendEnvelopeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimStkIsReadyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol);
|
||||
int32_t SetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol);
|
||||
int32_t SimOpenLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse);
|
||||
int32_t SimCloseLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol);
|
||||
int32_t SimOpenLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse);
|
||||
int32_t SimCloseLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SimTransmitApduLogicalChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
int32_t SimTransmitApduBasicChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
int32_t SimAuthenticationResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
int32_t UnlockSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
|
||||
private:
|
||||
int32_t ProcessIccIoInfo(
|
||||
std::shared_ptr<TelRilRequest> telRilRequest, std::shared_ptr<IccIoResultInfo> iccIoResult);
|
||||
int32_t ErrorIccIoResponse(
|
||||
std::shared_ptr<TelRilRequest> telRilRequest, const HRilRadioResponseInfo &responseInfo);
|
||||
void BuildIccIoResult(std::shared_ptr<IccIoResultInfo> iccIoResult, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
void BuildIccIoResult(std::shared_ptr<IccIoResultInfo> iccIoResult, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
void BuildCardStatusInfo(
|
||||
std::shared_ptr<CardStatusInfo> cardStatusInfo, const HDI::Ril::V1_0::CardStatusInfo &result);
|
||||
std::shared_ptr<CardStatusInfo> cardStatusInfo, const HDI::Ril::V1_1::CardStatusInfo &result);
|
||||
void BuildLockStatusResp(
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp, const HDI::Ril::V1_0::LockStatusResp &lockStatus);
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp, const HDI::Ril::V1_1::LockStatusResp &lockStatus);
|
||||
void BuildRadioProtocol(
|
||||
std::shared_ptr<RadioProtocol> protocol, const HDI::Ril::V1_0::RadioProtocol &radioProtocol);
|
||||
std::shared_ptr<RadioProtocol> protocol, const HDI::Ril::V1_1::RadioProtocol &radioProtocol);
|
||||
void BuildOpenLogicalChannelResp(std::shared_ptr<OpenLogicalChannelResponse> openLogicalChannelResp,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse);
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse);
|
||||
void BuildApduRequestInfo(
|
||||
OHOS::HDI::Ril::V1_0::ApduSimIORequestInfo &ApduRequestInfo, const ApduSimIORequestInfo &reqInfo);
|
||||
OHOS::HDI::Ril::V1_1::ApduSimIORequestInfo &ApduRequestInfo, const ApduSimIORequestInfo &reqInfo);
|
||||
int32_t ResponseIccIo(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result);
|
||||
};
|
||||
} // namespace Telephony
|
||||
} // namespace OHOS
|
||||
|
||||
@ -23,7 +23,7 @@ namespace OHOS {
|
||||
namespace Telephony {
|
||||
class TelRilSms : public TelRilBase {
|
||||
public:
|
||||
TelRilSms(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface, std::shared_ptr<ObserverHandler> observerHandler,
|
||||
TelRilSms(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface, std::shared_ptr<ObserverHandler> observerHandler,
|
||||
std::shared_ptr<TelRilHandler> handler);
|
||||
~TelRilSms() = default;
|
||||
|
||||
@ -53,55 +53,55 @@ public:
|
||||
int32_t UpdateCdmaSimMessage(
|
||||
int32_t cdmaIndex, int32_t state, std::string pdu, const AppExecFwk::InnerEvent::Pointer &response);
|
||||
|
||||
int32_t SendGsmSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t SendCdmaSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t AddSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t DelSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UpdateSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &iServiceCenterAddress);
|
||||
int32_t SetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CBConfigInfo &iCellBroadcastInfo);
|
||||
int32_t SetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CdmaCBConfigInfo &iCdmaCBConfigInfo);
|
||||
int32_t SendSmsMoreModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t SendSmsAckResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t AddCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t DelCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UpdateCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SendGsmSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t SendCdmaSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t AddSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t DelSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UpdateSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t SetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &iServiceCenterAddress);
|
||||
int32_t SetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CBConfigInfo &iCellBroadcastInfo);
|
||||
int32_t SetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t GetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CdmaCBConfigInfo &iCdmaCBConfigInfo);
|
||||
int32_t SendSmsMoreModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
int32_t SendSmsAckResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t AddCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t DelCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
int32_t UpdateCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
|
||||
|
||||
int32_t NewSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t NewCdmaSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t SmsStatusReportNotify(const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t NewSmsNotify(const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t NewCdmaSmsNotify(const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t SmsStatusReportNotify(const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo);
|
||||
int32_t NewSmsStoredOnSimNotify(int32_t recordNumber, int32_t indicationType);
|
||||
int32_t CBConfigNotify(const HDI::Ril::V1_0::CBConfigReportInfo &cellBroadConfigReportInfo);
|
||||
int32_t CBConfigNotify(const HDI::Ril::V1_1::CBConfigReportInfo &cellBroadConfigReportInfo);
|
||||
|
||||
private:
|
||||
bool IsSmsResponse(uint32_t code);
|
||||
bool IsSmsNotification(uint32_t code);
|
||||
HDI::Ril::V1_0::GsmSmsMessageInfo ConstructGsmSendSmsRequestLinkList(std::string &smsPdu, std::string &pdu);
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo ConstructSmsMessageIOInfoRequestLinkList(
|
||||
HDI::Ril::V1_1::GsmSmsMessageInfo ConstructGsmSendSmsRequestLinkList(std::string &smsPdu, std::string &pdu);
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo ConstructSmsMessageIOInfoRequestLinkList(
|
||||
std::string &smsPdu, std::string &pdu);
|
||||
void BuildSendSmsResultInfo(std::shared_ptr<SendSmsResultInfo> sendSmsResultInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo);
|
||||
void BuildCBConfigInfo(
|
||||
std::shared_ptr<CBConfigInfo> cellBroadcastInfo, const HDI::Ril::V1_0::CBConfigInfo &iCellBroadcastInfo);
|
||||
std::shared_ptr<CBConfigInfo> cellBroadcastInfo, const HDI::Ril::V1_1::CBConfigInfo &iCellBroadcastInfo);
|
||||
void BuildServiceCenterAddress(std::shared_ptr<ServiceCenterAddress> serCenterAddress,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &iServiceCenterAddress);
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &iServiceCenterAddress);
|
||||
void BuildCdmaCBConfigInfo(
|
||||
std::shared_ptr<CdmaCBConfigInfo> cdmaCBConfigInfo, const HDI::Ril::V1_0::CdmaCBConfigInfo &iCdmaCBConfigInfo);
|
||||
std::shared_ptr<CdmaCBConfigInfo> cdmaCBConfigInfo, const HDI::Ril::V1_1::CdmaCBConfigInfo &iCdmaCBConfigInfo);
|
||||
void BuildSmsMessageInfo(
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo, const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessageInfo);
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo, const HDI::Ril::V1_1::SmsMessageInfo &iSmsMessageInfo);
|
||||
void BuildCBConfigReportInfo(std::shared_ptr<CBConfigReportInfo> cellBroadConfigReportInfo,
|
||||
const HDI::Ril::V1_0::CBConfigReportInfo &iCellBroadConfigReportInfo);
|
||||
const HDI::Ril::V1_1::CBConfigReportInfo &iCellBroadConfigReportInfo);
|
||||
int32_t ResponseSendSms(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SendSmsResultInfo &result);
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SendSmsResultInfo &result);
|
||||
};
|
||||
} // namespace Telephony
|
||||
} // namespace OHOS
|
||||
|
||||
@ -24,14 +24,14 @@ std::unordered_map<int32_t, std::shared_ptr<TelRilRequest>> TelRilBase::requestM
|
||||
std::mutex TelRilBase::requestLock_;
|
||||
std::shared_ptr<TelRilHandler> TelRilBase::handler_;
|
||||
|
||||
TelRilBase::TelRilBase(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilBase::TelRilBase(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: observerHandler_(observerHandler), rilInterface_(rilInterface), slotId_(slotId)
|
||||
{
|
||||
handler_ = handler;
|
||||
}
|
||||
|
||||
void TelRilBase::ResetRilInterface(sptr<HDI::Ril::V1_0::IRil> rilInterface)
|
||||
void TelRilBase::ResetRilInterface(sptr<HDI::Ril::V1_1::IRil> rilInterface)
|
||||
{
|
||||
rilInterface_ = rilInterface;
|
||||
}
|
||||
|
||||
@ -23,33 +23,33 @@
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilCall::TelRilCall(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilCall::TelRilCall(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
|
||||
int32_t TelRilCall::AnswerResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::AnswerResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::HoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::HoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::UnHoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::UnHoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SwitchCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SwitchCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallListResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallInfoList &callInfoList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallInfoList &callInfoList)
|
||||
{
|
||||
std::shared_ptr<CallInfoList> callInfo = std::make_shared<CallInfoList>();
|
||||
if (callInfo == nullptr) {
|
||||
@ -60,38 +60,38 @@ int32_t TelRilCall::GetCallListResponse(
|
||||
return Response<CallInfoList>(TELEPHONY_LOG_FUNC_NAME, responseInfo, callInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::DialResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::DialResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::HangupResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::HangupResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::RejectResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::RejectResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CombineConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::CombineConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SeparateConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SeparateConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallSupplementResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::CallSupplementResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallWaitingResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallWaitResult &callWaitResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallWaitResult &callWaitResult)
|
||||
{
|
||||
std::shared_ptr<CallWaitResult> callWaitInfoResult = std::make_shared<CallWaitResult>();
|
||||
if (callWaitInfoResult == nullptr) {
|
||||
@ -114,18 +114,18 @@ int32_t TelRilCall::GetCallWaitingResponse(
|
||||
telRilRequest->pointer_->GetInnerEventId(), callWaitInfoResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallWaitingResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetCallWaitingResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList)
|
||||
int32_t TelRilCall::GetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList)
|
||||
{
|
||||
std::shared_ptr<CallForwardQueryInfoList> cFQueryInfoList = std::make_shared<CallForwardQueryInfoList>();
|
||||
if (cFQueryInfoList == nullptr) {
|
||||
@ -147,7 +147,7 @@ int32_t TelRilCall::GetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioRe
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetClipResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClipResult &getClipResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClipResult &getClipResult)
|
||||
{
|
||||
std::shared_ptr<GetClipResult> clipResult = std::make_shared<GetClipResult>();
|
||||
if (clipResult == nullptr) {
|
||||
@ -169,13 +169,13 @@ int32_t TelRilCall::GetClipResponse(
|
||||
return telRilRequest->pointer_->GetOwner()->SendEvent(telRilRequest->pointer_->GetInnerEventId(), clipResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetClipResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetClipResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetClirResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClirResult &getClirResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClirResult &getClirResult)
|
||||
{
|
||||
std::shared_ptr<GetClirResult> result = std::make_shared<GetClirResult>();
|
||||
if (result == nullptr) {
|
||||
@ -197,13 +197,13 @@ int32_t TelRilCall::GetClirResponse(
|
||||
return telRilRequest->pointer_->GetOwner()->SendEvent(telRilRequest->pointer_->GetInnerEventId(), result);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetClirResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetClirResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallRestrictionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallRestrictionResult &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallRestrictionResult &result)
|
||||
{
|
||||
std::shared_ptr<CallRestrictionResult> callRestrictionResult = std::make_shared<CallRestrictionResult>();
|
||||
if (callRestrictionResult == nullptr) {
|
||||
@ -226,57 +226,57 @@ int32_t TelRilCall::GetCallRestrictionResponse(
|
||||
telRilRequest->pointer_->GetInnerEventId(), callRestrictionResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallRestrictionResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetCallRestrictionResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return ResponseSupplement(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SendDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SendDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::StartDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::StartDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::StopDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::StopDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallPreferenceModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetCallPreferenceModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallPreferenceModeResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mode)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mode)
|
||||
{
|
||||
std::shared_ptr<int32_t> result = std::make_shared<int32_t>();
|
||||
*result = mode;
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t cusd)
|
||||
int32_t TelRilCall::GetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t cusd)
|
||||
{
|
||||
std::shared_ptr<int32_t> usdResult = std::make_shared<int32_t>();
|
||||
*usdResult = cusd;
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo, usdResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mute)
|
||||
int32_t TelRilCall::GetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mute)
|
||||
{
|
||||
std::shared_ptr<int32_t> muteResult = std::make_shared<int32_t>();
|
||||
*muteResult = mute;
|
||||
@ -284,14 +284,14 @@ int32_t TelRilCall::GetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallFailReasonResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t callFail)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t callFail)
|
||||
{
|
||||
std::shared_ptr<int32_t> failCause = std::make_shared<int32_t>();
|
||||
*failCause = callFail;
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo, failCause);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetBarringPasswordResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
@ -303,142 +303,142 @@ int32_t TelRilCall::CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRadioRe
|
||||
|
||||
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);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_LIST, &HDI::Ril::V1_1::IRil::GetCallList);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::Dial(const std::string address, int32_t clirMode, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::DialInfo dialInfo = {};
|
||||
HDI::Ril::V1_1::DialInfo dialInfo = {};
|
||||
dialInfo.address = address;
|
||||
dialInfo.clir = clirMode;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_DIAL, &HDI::Ril::V1_0::IRil::Dial, dialInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_DIAL, &HDI::Ril::V1_1::IRil::Dial, dialInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::Reject(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_REJECT, &HDI::Ril::V1_0::IRil::Reject);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_REJECT, &HDI::Ril::V1_1::IRil::Reject);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::Hangup(int32_t gsmIndex, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_HANGUP, &HDI::Ril::V1_0::IRil::Hangup, gsmIndex);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_HANGUP, &HDI::Ril::V1_1::IRil::Hangup, gsmIndex);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::Answer(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_ANSWER, &HDI::Ril::V1_0::IRil::Answer);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_ANSWER, &HDI::Ril::V1_1::IRil::Answer);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::HoldCall(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_HOLD_CALL, &HDI::Ril::V1_0::IRil::HoldCall);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_HOLD_CALL, &HDI::Ril::V1_1::IRil::HoldCall);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::UnHoldCall(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_UNHOLD_CALL, &HDI::Ril::V1_0::IRil::UnHoldCall);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_UNHOLD_CALL, &HDI::Ril::V1_1::IRil::UnHoldCall);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SwitchCall(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SWITCH_CALL, &HDI::Ril::V1_0::IRil::SwitchCall);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SWITCH_CALL, &HDI::Ril::V1_1::IRil::SwitchCall);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CombineConference(int32_t callType, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_COMBINE_CONFERENCE,
|
||||
&HDI::Ril::V1_0::IRil::CombineConference, callType);
|
||||
&HDI::Ril::V1_1::IRil::CombineConference, callType);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallWaiting(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_WAITING, &HDI::Ril::V1_0::IRil::GetCallWaiting);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_WAITING, &HDI::Ril::V1_1::IRil::GetCallWaiting);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallWaiting(int32_t activate, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CALL_WAITING, &HDI::Ril::V1_0::IRil::SetCallWaiting, activate);
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CALL_WAITING, &HDI::Ril::V1_1::IRil::SetCallWaiting, activate);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SeparateConference(
|
||||
int32_t callIndex, int32_t callType, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SEPARATE_CONFERENCE,
|
||||
&HDI::Ril::V1_0::IRil::SeparateConference, callIndex, callType);
|
||||
&HDI::Ril::V1_1::IRil::SeparateConference, callIndex, callType);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallSupplement(int32_t type, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_CALL_SUPPLEMENT, &HDI::Ril::V1_0::IRil::CallSupplement, type);
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_CALL_SUPPLEMENT, &HDI::Ril::V1_1::IRil::CallSupplement, type);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallTransferInfo(int32_t reason, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_TRANSFER_INFO,
|
||||
&HDI::Ril::V1_0::IRil::GetCallTransferInfo, reason);
|
||||
&HDI::Ril::V1_1::IRil::GetCallTransferInfo, reason);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallTransferInfo(
|
||||
int32_t reason, int32_t mode, std::string number, int32_t classx, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::CallForwardSetInfo callForwardSetInfo = {};
|
||||
HDI::Ril::V1_1::CallForwardSetInfo callForwardSetInfo = {};
|
||||
callForwardSetInfo.reason = reason;
|
||||
callForwardSetInfo.mode = mode;
|
||||
callForwardSetInfo.classx = classx;
|
||||
callForwardSetInfo.number = number;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CALL_TRANSFER_INFO,
|
||||
&HDI::Ril::V1_0::IRil::SetCallTransferInfo, callForwardSetInfo);
|
||||
&HDI::Ril::V1_1::IRil::SetCallTransferInfo, callForwardSetInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetClip(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CLIP, &HDI::Ril::V1_0::IRil::GetClip);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CLIP, &HDI::Ril::V1_1::IRil::GetClip);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetClip(const int32_t action, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CLIP, &HDI::Ril::V1_0::IRil::SetClip, action);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CLIP, &HDI::Ril::V1_1::IRil::SetClip, action);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetClir(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CLIR, &HDI::Ril::V1_0::IRil::GetClir);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CLIR, &HDI::Ril::V1_1::IRil::GetClir);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetClir(const int32_t action, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CLIR, &HDI::Ril::V1_0::IRil::SetClir, action);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CLIR, &HDI::Ril::V1_1::IRil::SetClir, action);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallRestriction(std::string fac, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_RESTRICTION,
|
||||
&HDI::Ril::V1_0::IRil::GetCallRestriction, fac);
|
||||
&HDI::Ril::V1_1::IRil::GetCallRestriction, fac);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallRestriction(
|
||||
std::string fac, int32_t mode, std::string password, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::CallRestrictionInfo callRestrictionInfo = {};
|
||||
HDI::Ril::V1_1::CallRestrictionInfo callRestrictionInfo = {};
|
||||
callRestrictionInfo.fac = fac;
|
||||
callRestrictionInfo.mode = mode;
|
||||
callRestrictionInfo.password = password;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CALL_RESTRICTION,
|
||||
&HDI::Ril::V1_0::IRil::SetCallRestriction, callRestrictionInfo);
|
||||
&HDI::Ril::V1_1::IRil::SetCallRestriction, callRestrictionInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SendDtmf(const std::string &sDTMFCode, int32_t index, int32_t switchOn, int32_t switchOff,
|
||||
const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::DtmfInfo dtmfInfo = {};
|
||||
HDI::Ril::V1_1::DtmfInfo dtmfInfo = {};
|
||||
dtmfInfo.callId = index;
|
||||
dtmfInfo.dtmfKey = sDTMFCode;
|
||||
dtmfInfo.onLength = switchOn;
|
||||
dtmfInfo.offLength = switchOff;
|
||||
dtmfInfo.stringLength = sDTMFCode.length();
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SEND_DTMF, &HDI::Ril::V1_0::IRil::SendDtmf, dtmfInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SEND_DTMF, &HDI::Ril::V1_1::IRil::SendDtmf, dtmfInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SendDtmf(char cDTMFCode, int32_t index, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
@ -447,13 +447,13 @@ int32_t TelRilCall::SendDtmf(char cDTMFCode, int32_t index, const AppExecFwk::In
|
||||
dtmfKey[0] = cDTMFCode;
|
||||
dtmfKey[1] = '\0';
|
||||
|
||||
HDI::Ril::V1_0::DtmfInfo dtmfInfo = {};
|
||||
HDI::Ril::V1_1::DtmfInfo dtmfInfo = {};
|
||||
dtmfInfo.callId = index;
|
||||
dtmfInfo.dtmfKey = dtmfKey;
|
||||
dtmfInfo.onLength = 1;
|
||||
dtmfInfo.offLength = 0;
|
||||
dtmfInfo.stringLength = 1;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SEND_DTMF, &HDI::Ril::V1_0::IRil::SendDtmf, dtmfInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SEND_DTMF, &HDI::Ril::V1_1::IRil::SendDtmf, dtmfInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::StartDtmf(char cDTMFCode, int32_t index, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
@ -462,10 +462,10 @@ int32_t TelRilCall::StartDtmf(char cDTMFCode, int32_t index, const AppExecFwk::I
|
||||
dtmfKey[0] = cDTMFCode;
|
||||
dtmfKey[1] = '\0';
|
||||
|
||||
HDI::Ril::V1_0::DtmfInfo dtmfInfo = {};
|
||||
HDI::Ril::V1_1::DtmfInfo dtmfInfo = {};
|
||||
dtmfInfo.callId = index;
|
||||
dtmfInfo.dtmfKey = dtmfKey;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_START_DTMF, &HDI::Ril::V1_0::IRil::StartDtmf, dtmfInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_START_DTMF, &HDI::Ril::V1_1::IRil::StartDtmf, dtmfInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::StopDtmf(int32_t index, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
@ -474,43 +474,43 @@ int32_t TelRilCall::StopDtmf(int32_t index, const AppExecFwk::InnerEvent::Pointe
|
||||
dtmfKey[0] = 'A';
|
||||
dtmfKey[1] = '\0';
|
||||
|
||||
HDI::Ril::V1_0::DtmfInfo dtmfInfo = {};
|
||||
HDI::Ril::V1_1::DtmfInfo dtmfInfo = {};
|
||||
dtmfInfo.callId = index;
|
||||
dtmfInfo.dtmfKey = dtmfKey;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_STOP_DTMF, &HDI::Ril::V1_0::IRil::StopDtmf, dtmfInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_STOP_DTMF, &HDI::Ril::V1_1::IRil::StopDtmf, dtmfInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetCallPreferenceMode(const int32_t mode, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_CALL_PREFERENCE,
|
||||
&HDI::Ril::V1_0::IRil::SetCallPreferenceMode, mode);
|
||||
&HDI::Ril::V1_1::IRil::SetCallPreferenceMode, mode);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetCallPreferenceMode(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_PREFERENCE, &HDI::Ril::V1_0::IRil::GetCallPreferenceMode);
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_CALL_PREFERENCE, &HDI::Ril::V1_1::IRil::GetCallPreferenceMode);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetUssd(const std::string str, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_USSD, &HDI::Ril::V1_0::IRil::SetUssd, str);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_USSD, &HDI::Ril::V1_1::IRil::SetUssd, str);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetUssd(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_USSD, &HDI::Ril::V1_0::IRil::GetUssd);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_USSD, &HDI::Ril::V1_1::IRil::GetUssd);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetBarringPassword(
|
||||
std::string fac, std::string oldPassword, std::string newPassword, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::SetBarringInfo setBarringInfo = {};
|
||||
HDI::Ril::V1_1::SetBarringInfo setBarringInfo = {};
|
||||
setBarringInfo.fac = fac;
|
||||
setBarringInfo.oldPassword = oldPassword;
|
||||
setBarringInfo.newPassword = newPassword;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_BARRING_PASSWORD,
|
||||
&HDI::Ril::V1_0::IRil::SetBarringPassword, setBarringInfo);
|
||||
&HDI::Ril::V1_1::IRil::SetBarringPassword, setBarringInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CloseUnFinishedUssd(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
@ -524,7 +524,7 @@ int32_t TelRilCall::CallStateUpdated()
|
||||
return Notify(TELEPHONY_LOG_FUNC_NAME, RadioEvent::RADIO_CALL_STATUS_INFO);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallUssdNotice(const HDI::Ril::V1_0::UssdNoticeInfo &ussdNoticeInfo)
|
||||
int32_t TelRilCall::CallUssdNotice(const HDI::Ril::V1_1::UssdNoticeInfo &ussdNoticeInfo)
|
||||
{
|
||||
std::shared_ptr<UssdNoticeInfo> ussdNotice = std::make_shared<UssdNoticeInfo>();
|
||||
if (ussdNotice == nullptr) {
|
||||
@ -536,7 +536,7 @@ int32_t TelRilCall::CallUssdNotice(const HDI::Ril::V1_0::UssdNoticeInfo &ussdNot
|
||||
return Notify<UssdNoticeInfo>(TELEPHONY_LOG_FUNC_NAME, ussdNotice, RadioEvent::RADIO_CALL_USSD_NOTICE);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallSsNotice(const HDI::Ril::V1_0::SsNoticeInfo &ssNoticeInfo)
|
||||
int32_t TelRilCall::CallSsNotice(const HDI::Ril::V1_1::SsNoticeInfo &ssNoticeInfo)
|
||||
{
|
||||
std::shared_ptr<SsNoticeInfo> ssNotice = std::make_shared<SsNoticeInfo>();
|
||||
if (ssNotice == nullptr) {
|
||||
@ -550,7 +550,7 @@ int32_t TelRilCall::CallSsNotice(const HDI::Ril::V1_0::SsNoticeInfo &ssNoticeInf
|
||||
return Notify<SsNoticeInfo>(TELEPHONY_LOG_FUNC_NAME, ssNotice, RadioEvent::RADIO_CALL_SS_NOTICE);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallRingbackVoiceNotice(const HDI::Ril::V1_0::RingbackVoice &ringbackVoice)
|
||||
int32_t TelRilCall::CallRingbackVoiceNotice(const HDI::Ril::V1_1::RingbackVoice &ringbackVoice)
|
||||
{
|
||||
std::shared_ptr<RingbackVoice> ringbackVoiceInfo = std::make_shared<RingbackVoice>();
|
||||
if (ringbackVoiceInfo == nullptr) {
|
||||
@ -561,7 +561,7 @@ int32_t TelRilCall::CallRingbackVoiceNotice(const HDI::Ril::V1_0::RingbackVoice
|
||||
return Notify<RingbackVoice>(TELEPHONY_LOG_FUNC_NAME, ringbackVoiceInfo, RadioEvent::RADIO_CALL_RINGBACK_VOICE);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallSrvccStatusNotice(const HDI::Ril::V1_0::SrvccStatus &srvccStatus)
|
||||
int32_t TelRilCall::CallSrvccStatusNotice(const HDI::Ril::V1_1::SrvccStatus &srvccStatus)
|
||||
{
|
||||
std::shared_ptr<SrvccStatus> srvccStatusInfo = std::make_shared<SrvccStatus>();
|
||||
if (srvccStatusInfo == nullptr) {
|
||||
@ -579,49 +579,49 @@ int32_t TelRilCall::CallRsrvccStatusNotify()
|
||||
|
||||
int32_t TelRilCall::SetMute(const int32_t mute, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_MUTE, &HDI::Ril::V1_0::IRil::SetMute, mute);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_MUTE, &HDI::Ril::V1_1::IRil::SetMute, mute);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetMute(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_MUTE, &HDI::Ril::V1_0::IRil::GetMute);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_MUTE, &HDI::Ril::V1_1::IRil::GetMute);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetEmergencyCallList(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_EMERGENCY_LIST, &HDI::Ril::V1_0::IRil::GetEmergencyCallList);
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_EMERGENCY_LIST, &HDI::Ril::V1_1::IRil::GetEmergencyCallList);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetEmergencyCallList(
|
||||
const std::vector<EmergencyCall> &eccVec, const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
HDI::Ril::V1_0::EmergencyInfoList emergencyInfoList;
|
||||
HDI::Ril::V1_1::EmergencyInfoList emergencyInfoList;
|
||||
emergencyInfoList.callSize = static_cast<int32_t>(eccVec.size());
|
||||
int index = 1;
|
||||
for (EmergencyCall ecc : eccVec) {
|
||||
HDI::Ril::V1_0::EmergencyCall emergencyCall = {};
|
||||
HDI::Ril::V1_1::EmergencyCall emergencyCall = {};
|
||||
emergencyCall.index = index;
|
||||
emergencyCall.total = eccVec.size();
|
||||
emergencyCall.eccNum = ecc.eccNum;
|
||||
emergencyCall.eccType = (HDI::Ril::V1_0::EccType)(ecc.eccType);
|
||||
emergencyCall.simpresent = (HDI::Ril::V1_0::SimpresentType)(ecc.simpresent);
|
||||
emergencyCall.eccType = (HDI::Ril::V1_1::EccType)(ecc.eccType);
|
||||
emergencyCall.simpresent = (HDI::Ril::V1_1::SimpresentType)(ecc.simpresent);
|
||||
emergencyCall.mcc = ecc.mcc;
|
||||
emergencyCall.abnormalService = (HDI::Ril::V1_0::AbnormalServiceType)(ecc.abnormalService);
|
||||
emergencyCall.abnormalService = (HDI::Ril::V1_1::AbnormalServiceType)(ecc.abnormalService);
|
||||
index++;
|
||||
emergencyInfoList.calls.push_back(emergencyCall);
|
||||
}
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_SET_EMERGENCY_LIST,
|
||||
&HDI::Ril::V1_0::IRil::SetEmergencyCallList, emergencyInfoList);
|
||||
&HDI::Ril::V1_1::IRil::SetEmergencyCallList, emergencyInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::SetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCall::SetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::GetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList)
|
||||
int32_t TelRilCall::GetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList)
|
||||
{
|
||||
std::shared_ptr<EmergencyInfoList> emergencyCallList = std::make_shared<EmergencyInfoList>();
|
||||
if (emergencyCallList == nullptr) {
|
||||
@ -635,10 +635,10 @@ int32_t TelRilCall::GetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioR
|
||||
int32_t TelRilCall::GetCallFailReason(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_FAIL_REASON, &HDI::Ril::V1_0::IRil::GetCallFailReason);
|
||||
TELEPHONY_LOG_FUNC_NAME, result, HREQ_CALL_GET_FAIL_REASON, &HDI::Ril::V1_1::IRil::GetCallFailReason);
|
||||
}
|
||||
|
||||
int32_t TelRilCall::CallEmergencyNotice(const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList)
|
||||
int32_t TelRilCall::CallEmergencyNotice(const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList)
|
||||
{
|
||||
std::shared_ptr<EmergencyInfoList> emergencyCallInfoList = std::make_shared<EmergencyInfoList>();
|
||||
BuildEmergencyInfoList(emergencyCallInfoList, emergencyInfoList);
|
||||
@ -647,7 +647,7 @@ int32_t TelRilCall::CallEmergencyNotice(const HDI::Ril::V1_0::EmergencyInfoList
|
||||
}
|
||||
|
||||
void TelRilCall::BuildEmergencyInfoList(
|
||||
std::shared_ptr<EmergencyInfoList> emergencyCallList, const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList)
|
||||
std::shared_ptr<EmergencyInfoList> emergencyCallList, const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList)
|
||||
{
|
||||
emergencyCallList->callSize = emergencyInfoList.callSize;
|
||||
for (auto ecc : emergencyInfoList.calls) {
|
||||
@ -663,7 +663,7 @@ void TelRilCall::BuildEmergencyInfoList(
|
||||
}
|
||||
|
||||
void TelRilCall::BuildCallInfoList(
|
||||
std::shared_ptr<CallInfoList> callInfoList, const HDI::Ril::V1_0::CallInfoList &iCallInfoList)
|
||||
std::shared_ptr<CallInfoList> callInfoList, const HDI::Ril::V1_1::CallInfoList &iCallInfoList)
|
||||
{
|
||||
callInfoList->callSize = iCallInfoList.callSize;
|
||||
for (auto info : iCallInfoList.calls) {
|
||||
@ -683,7 +683,7 @@ void TelRilCall::BuildCallInfoList(
|
||||
}
|
||||
|
||||
void TelRilCall::BuildCFQueryInfoList(std::shared_ptr<CallForwardQueryInfoList> cFQueryInfoList,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList)
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList)
|
||||
{
|
||||
cFQueryInfoList->callSize = cFQueryList.callSize;
|
||||
for (auto info : cFQueryList.calls) {
|
||||
@ -700,7 +700,7 @@ void TelRilCall::BuildCFQueryInfoList(std::shared_ptr<CallForwardQueryInfoList>
|
||||
}
|
||||
}
|
||||
|
||||
int32_t TelRilCall::ResponseSupplement(const char *funcName, const HDI::Ril::V1_0::RilRadioResponseInfo &iResponseInfo)
|
||||
int32_t TelRilCall::ResponseSupplement(const char *funcName, const HDI::Ril::V1_1::RilRadioResponseInfo &iResponseInfo)
|
||||
{
|
||||
const auto &radioResponseInfo = BuildHRilRadioResponseInfo(iResponseInfo);
|
||||
auto telRilRequest = FindTelRilRequest(radioResponseInfo);
|
||||
|
||||
@ -20,222 +20,222 @@ namespace Telephony {
|
||||
TelRilCallback::TelRilCallback(std::shared_ptr<TelRilManager> telRilManager) : telRilManager_(telRilManager) {}
|
||||
|
||||
// Call
|
||||
int32_t TelRilCallback::SetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetEmergencyCallListResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetEmergencyCallListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList)
|
||||
int32_t TelRilCallback::GetEmergencyCallListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetEmergencyCallListResponse, emergencyInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallEmergencyNotice(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::EmergencyInfoList &emergencyInfoList)
|
||||
int32_t TelRilCallback::CallEmergencyNotice(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::EmergencyInfoList &emergencyInfoList)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallEmergencyNotice, emergencyInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::CallStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallStateUpdated);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallRingbackVoiceNotice(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RingbackVoice &ringbackVoice)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RingbackVoice &ringbackVoice)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallRingbackVoiceNotice, ringbackVoice);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallSrvccStatusNotice(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SrvccStatus &srvccStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SrvccStatus &srvccStatus)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallSrvccStatusNotice, srvccStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallUssdNotice(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::UssdNoticeInfo &ussdNoticeInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::UssdNoticeInfo &ussdNoticeInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallUssdNotice, ussdNoticeInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallSsNotice(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SsNoticeInfo &ssNoticeInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SsNoticeInfo &ssNoticeInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallSsNotice, ssNoticeInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallRsrvccStatusNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::CallRsrvccStatusNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallRsrvccStatusNotify);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallListResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallInfoList &callList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallInfoList &callList)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallListResponse, callList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::DialResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::DialResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::DialResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::HangupResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::HangupResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::HangupResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::RejectResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::RejectResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::RejectResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::AnswerResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::AnswerResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::AnswerResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::HoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::HoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::HoldCallResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnHoldCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::UnHoldCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::UnHoldCallResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SwitchCallResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SwitchCallResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SwitchCallResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetClipResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClipResult &getClipResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClipResult &getClipResult)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetClipResponse, getClipResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetClipResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetClipResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetClipResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CombineConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::CombineConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CombineConferenceResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SeparateConferenceResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SeparateConferenceResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SeparateConferenceResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CallSupplementResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::CallSupplementResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::CallSupplementResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallWaitingResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallWaitResult &callWaitResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallWaitResult &callWaitResult)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallWaitingResponse, callWaitResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCallWaitingResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCallWaitingResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetCallWaitingResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CallForwardQueryInfoList &cFQueryList)
|
||||
int32_t TelRilCallback::GetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallTransferInfoResponse, cFQueryList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCallTransferInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCallTransferInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetCallTransferInfoResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallRestrictionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CallRestrictionResult &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CallRestrictionResult &result)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallRestrictionResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCallRestrictionResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCallRestrictionResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetCallRestrictionResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetClirResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::GetClirResult &getClirResult)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::GetClirResult &getClirResult)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetClirResponse, getClirResult);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetClirResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetClirResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetClirResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::StartDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::StartDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::StartDtmfResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SendDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SendDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SendDtmfResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::StopDtmfResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::StopDtmfResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::StopDtmfResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallPreferenceModeResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mode)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mode)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallPreferenceModeResponse, mode);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCallPreferenceModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCallPreferenceModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetCallPreferenceModeResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetUssdResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetUssdResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t cusd)
|
||||
int32_t TelRilCallback::GetUssdResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t cusd)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetUssdResponse, cusd);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetMuteResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetMuteResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t mute)
|
||||
int32_t TelRilCallback::GetMuteResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t mute)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetMuteResponse, mute);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCallFailReasonResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t callFail)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t callFail)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::GetCallFailReasonResponse, callFail);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetBarringPasswordResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetBarringPasswordResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilCall, &TelRilCall::SetBarringPasswordResponse);
|
||||
}
|
||||
@ -246,547 +246,547 @@ int32_t TelRilCallback::CloseUnFinishedUssdResponse(const HDI::Ril::V1_1::RilRad
|
||||
}
|
||||
|
||||
// Data
|
||||
int32_t TelRilCallback::PdpContextListUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataCallResultList &dataCallResultList)
|
||||
int32_t TelRilCallback::PdpContextListUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &dataCallResultList)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilData, &TelRilData::PdpContextListUpdated, dataCallResultList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::ActivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &setupDataCallResultInfo)
|
||||
int32_t TelRilCallback::ActivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &setupDataCallResultInfo)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilData, &TelRilData::ActivatePdpContextResponse, setupDataCallResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::DeactivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::DeactivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilData, &TelRilData::DeactivatePdpContextResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetPdpContextListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataCallResultList &dataCallResultList)
|
||||
int32_t TelRilCallback::GetPdpContextListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &dataCallResultList)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilData, &TelRilData::GetPdpContextListResponse, dataCallResultList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetInitApnInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetInitApnInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilData, &TelRilData::SetInitApnInfoResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilData, &TelRilData::SetLinkBandwidthReportingRuleResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetLinkBandwidthInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &dataLinkBandwidthInfo)
|
||||
int32_t TelRilCallback::GetLinkBandwidthInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &dataLinkBandwidthInfo)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilData, &TelRilData::GetLinkBandwidthInfoResponse, dataLinkBandwidthInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetDataPermittedResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetDataPermittedResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilData, &TelRilData::SetDataPermittedResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::RadioStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
int32_t TelRilCallback::RadioStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::RadioStateUpdated, state);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::VoiceRadioTechUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
int32_t TelRilCallback::VoiceRadioTechUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
{
|
||||
return Notify(
|
||||
responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::VoiceRadioTechUpdated, voiceRadioTechnology);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::ShutDownResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::ShutDownResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::ShutDownResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::SetRadioStateResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
int32_t TelRilCallback::GetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::GetRadioStateResponse, state);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetImeiResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &imei)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &imei)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::GetImeiResponse, imei);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetMeidResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &meid)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &meid)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::GetMeidResponse, meid);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
int32_t TelRilCallback::GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::GetVoiceRadioTechnologyResponse,
|
||||
voiceRadioTechnology);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetBasebandVersionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilModem, &TelRilModem::GetBasebandVersionResponse, basebandVersion);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStateUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStateUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStateUpdated);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkSessionEndNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStkSessionEndNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkSessionEndNotify);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkProactiveNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkProactiveNotify, response);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkAlphaNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkAlphaNotify, response);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkEventNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkEventNotify, response);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkCallSetupNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStkCallSetupNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkCallSetupNotify);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimRefreshNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimRefreshNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimRefreshNotify);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimRadioProtocolUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimRadioProtocolUpdated, radioProtocol);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetSimIOResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::GetSimIOResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetSimStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CardStatusInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::GetSimStatusResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetImsiResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &response)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::GetImsiResponse, response);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetSimLockStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t simLockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t simLockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::GetSimLockStatusResponse, simLockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SetSimLockResponse, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::ChangeSimPasswordResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::ChangeSimPasswordResponse, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnlockPinResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::UnlockPinResponse, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnlockPukResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::UnlockPukResponse, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnlockPin2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::UnlockPin2Response, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnlockPuk2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::UnlockPuk2Response, lockStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetActiveSimResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetActiveSimResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SetActiveSimResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkSendTerminalResponseResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStkSendTerminalResponseResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkSendTerminalResponseResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkSendEnvelopeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStkSendEnvelopeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkSendEnvelopeResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkSendCallSetupRequestResultResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkSendCallSetupRequestResultResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimStkIsReadyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimStkIsReadyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimStkIsReadyResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
return TaskSchedule(responseInfo.slotId, &TelRilManager::GetTelRilSim, &TelRilSim::GetRadioProtocolResponse,
|
||||
responseInfo, radioProtocol);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
return TaskSchedule(responseInfo.slotId, &TelRilManager::GetTelRilSim, &TelRilSim::SetRadioProtocolResponse,
|
||||
responseInfo, radioProtocol);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimOpenLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
int32_t TelRilCallback::SimOpenLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimOpenLogicalChannelResponse,
|
||||
pOpenLogicalChannelResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimCloseLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SimCloseLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimCloseLogicalChannelResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimTransmitApduLogicalChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimTransmitApduLogicalChannelResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimTransmitApduBasicChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimTransmitApduBasicChannelResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SimAuthenticationResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::SimAuthenticationResponse, result);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UnlockSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSim, &TelRilSim::UnlockSimLockResponse, lockStatus);
|
||||
}
|
||||
|
||||
// Network
|
||||
int32_t TelRilCallback::NetworkCsRegStatusUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkCsRegStatusUpdated,
|
||||
csRegStatusInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NetworkPsRegStatusUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkPsRegStatusUpdated,
|
||||
psRegStatusInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SignalStrengthUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SignalStrengthUpdated, rssi);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NetworkTimeZoneUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &timeZoneStr)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &timeZoneStr)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkTimeZoneUpdated, timeZoneStr);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NetworkTimeUpdated(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &timeStr)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &timeStr)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkTimeUpdated, timeStr);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList)
|
||||
int32_t TelRilCallback::NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkPhyChnlCfgUpdated,
|
||||
channelConfigInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NetworkCurrentCellUpdated(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CellListCurrentInfo &cellListCurrentInfo)
|
||||
int32_t TelRilCallback::NetworkCurrentCellUpdated(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CellListCurrentInfo &cellListCurrentInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::NetworkCurrentCellUpdated,
|
||||
cellListCurrentInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetSignalStrengthResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetSignalStrengthResponse, rssi);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCsRegStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetCsRegStatusResponse, csRegStatusInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetPsRegStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetPsRegStatusResponse, psRegStatusInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetOperatorInfoResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::OperatorInfo &operatorInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::OperatorInfo &operatorInfo)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetOperatorInfoResponse, operatorInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetNetworkSearchInformationResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList)
|
||||
int32_t TelRilCallback::GetNetworkSearchInformationResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetNetworkSearchInformationResponse,
|
||||
availableNetworkList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
int32_t TelRilCallback::GetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetNetworkSelectionModeResponse,
|
||||
setNetworkModeInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SetNetworkSelectionModeResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetNeighboringCellInfoListResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetNeighboringCellInfoListResponse,
|
||||
cellInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCurrentCellInfoResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList)
|
||||
{
|
||||
return Response(
|
||||
responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetCurrentCellInfoResponse, cellInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SetPreferredNetworkResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PreferredNetworkTypeInfo &preferredNetworkTypeInfo)
|
||||
int32_t TelRilCallback::GetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PreferredNetworkTypeInfo &preferredNetworkTypeInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetPreferredNetworkResponse,
|
||||
preferredNetworkTypeInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetPhysicalChannelConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList)
|
||||
int32_t TelRilCallback::GetPhysicalChannelConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::GetPhysicalChannelConfigResponse,
|
||||
channelConfigInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetLocateUpdatesResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetLocateUpdatesResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SetLocateUpdatesResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetNotificationFilterResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetNotificationFilterResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SetNotificationFilterResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetDeviceStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetDeviceStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilNetwork, &TelRilNetwork::SetDeviceStateResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NewSmsNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::NewSmsNotify, smsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NewCdmaSmsNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::NewCdmaSmsNotify, smsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SmsStatusReportNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SmsMessageInfo &smsMessageInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SmsMessageInfo &smsMessageInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SmsStatusReportNotify, smsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::NewSmsStoredOnSimNotify(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t recordNumber, int32_t indicationType)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t recordNumber, int32_t indicationType)
|
||||
{
|
||||
return Notify(
|
||||
responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::NewSmsStoredOnSimNotify, recordNumber, indicationType);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CBConfigNotify(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::CBConfigReportInfo &cellBroadConfigReportInfo)
|
||||
int32_t TelRilCallback::CBConfigNotify(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::CBConfigReportInfo &cellBroadConfigReportInfo)
|
||||
{
|
||||
return Notify(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::CBConfigNotify, cellBroadConfigReportInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SendGsmSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo)
|
||||
int32_t TelRilCallback::SendGsmSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SendGsmSmsResponse, sendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SendCdmaSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo)
|
||||
int32_t TelRilCallback::SendCdmaSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SendCdmaSmsResponse, sendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::AddSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::AddSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::AddSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::DelSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::DelSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::DelSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UpdateSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::UpdateSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::UpdateSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::AddCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::AddCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::AddCdmaSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::DelCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::DelCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::DelCdmaSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::UpdateCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::UpdateCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::UpdateCdmaSimMessageResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SetSmscAddrResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &serviceCenterAddress)
|
||||
int32_t TelRilCallback::GetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &serviceCenterAddress)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::GetSmscAddrResponse, serviceCenterAddress);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SetCBConfigResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCBConfigResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CBConfigInfo &cellBroadcastInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CBConfigInfo &cellBroadcastInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::GetCBConfigResponse, cellBroadcastInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SetCdmaCBConfigResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::GetCdmaCBConfigResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CdmaCBConfigInfo &cdmaCBConfigInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CdmaCBConfigInfo &cdmaCBConfigInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::GetCdmaCBConfigResponse, cdmaCBConfigInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SendSmsMoreModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &sendSmsResultInfo)
|
||||
int32_t TelRilCallback::SendSmsMoreModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &sendSmsResultInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SendSmsMoreModeResponse, sendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::SendSmsAckResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::SendSmsAckResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(responseInfo, &TelRilManager::GetTelRilSms, &TelRilSms::SendSmsAckResponse);
|
||||
}
|
||||
|
||||
int32_t TelRilCallback::CommonErrorResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilCallback::CommonErrorResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
TELEPHONY_LOGE("CommonErrorResponse slotId: %{public}d serial: %{public}d error: %{public}d", responseInfo.slotId,
|
||||
responseInfo.serial, responseInfo.error);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilData::TelRilData(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilData::TelRilData(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
@ -41,9 +41,9 @@ void TelRilData::DataResponseError(HRilErrType errCode, const AppExecFwk::InnerE
|
||||
}
|
||||
}
|
||||
|
||||
HDI::Ril::V1_0::DataProfileDataInfo TelRilData::ChangeDPToHalDataProfile(DataProfile dataProfile)
|
||||
HDI::Ril::V1_1::DataProfileDataInfo TelRilData::ChangeDPToHalDataProfile(DataProfile dataProfile)
|
||||
{
|
||||
HDI::Ril::V1_0::DataProfileDataInfo dataProfileInfo;
|
||||
HDI::Ril::V1_1::DataProfileDataInfo dataProfileInfo;
|
||||
dataProfileInfo.profileId = dataProfile.profileId;
|
||||
dataProfileInfo.password = dataProfile.password;
|
||||
dataProfileInfo.authenticationType = dataProfile.verType;
|
||||
@ -56,14 +56,14 @@ HDI::Ril::V1_0::DataProfileDataInfo TelRilData::ChangeDPToHalDataProfile(DataPro
|
||||
|
||||
int32_t TelRilData::DeactivatePdpContext(int32_t cid, int32_t reason, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::UniInfo uniInfo;
|
||||
HDI::Ril::V1_1::UniInfo uniInfo;
|
||||
uniInfo.gsmIndex = cid;
|
||||
uniInfo.arg1 = reason;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_DEACTIVATE_PDP_CONTEXT,
|
||||
&HDI::Ril::V1_0::IRil::DeactivatePdpContext, uniInfo);
|
||||
&HDI::Ril::V1_1::IRil::DeactivatePdpContext, uniInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilData::DeactivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilData::DeactivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
@ -71,17 +71,17 @@ int32_t TelRilData::DeactivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioR
|
||||
int32_t TelRilData::ActivatePdpContext(int32_t radioTechnology, DataProfile dataProfile, bool isRoaming,
|
||||
bool allowRoaming, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::DataCallInfo dataCallInfo;
|
||||
HDI::Ril::V1_1::DataCallInfo dataCallInfo;
|
||||
dataCallInfo.radioTechnology = radioTechnology;
|
||||
dataCallInfo.dataProfileInfo = ChangeDPToHalDataProfile(dataProfile);
|
||||
dataCallInfo.roamingAllowed = allowRoaming;
|
||||
dataCallInfo.isRoaming = isRoaming;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_ACTIVATE_PDP_CONTEXT,
|
||||
&HDI::Ril::V1_0::IRil::ActivatePdpContext, dataCallInfo);
|
||||
&HDI::Ril::V1_1::IRil::ActivatePdpContext, dataCallInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilData::ActivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &iSetupDataCallResultInfo)
|
||||
int32_t TelRilData::ActivatePdpContextResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &iSetupDataCallResultInfo)
|
||||
{
|
||||
auto getDataFunc = [&iSetupDataCallResultInfo, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<SetupDataCallResultInfo> setupDataCallResultInfo = std::make_shared<SetupDataCallResultInfo>();
|
||||
@ -94,13 +94,13 @@ int32_t TelRilData::ActivatePdpContextResponse(const HDI::Ril::V1_0::RilRadioRes
|
||||
|
||||
int32_t TelRilData::GetPdpContextList(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::UniInfo uniInfo;
|
||||
HDI::Ril::V1_1::UniInfo uniInfo;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_GET_PDP_CONTEXT_LIST,
|
||||
&HDI::Ril::V1_0::IRil::GetPdpContextList, uniInfo);
|
||||
&HDI::Ril::V1_1::IRil::GetPdpContextList, uniInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilData::GetPdpContextListResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList)
|
||||
int32_t TelRilData::GetPdpContextListResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList)
|
||||
{
|
||||
if (iDataCallResultList.size != (int32_t)iDataCallResultList.dcList.size()) {
|
||||
TELEPHONY_LOGE("Slot%{public}d iDataCallResultList.size is invalid", slotId_);
|
||||
@ -120,17 +120,17 @@ int32_t TelRilData::GetPdpContextListResponse(const HDI::Ril::V1_0::RilRadioResp
|
||||
|
||||
int32_t TelRilData::SetInitApnInfo(const DataProfile &dataProfile, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::DataProfileDataInfo dataProfileInfo = ChangeDPToHalDataProfile(dataProfile);
|
||||
HDI::Ril::V1_1::DataProfileDataInfo dataProfileInfo = ChangeDPToHalDataProfile(dataProfile);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_SET_INIT_APN_INFO,
|
||||
&HDI::Ril::V1_0::IRil::SetInitApnInfo, dataProfileInfo);
|
||||
&HDI::Ril::V1_1::IRil::SetInitApnInfo, dataProfileInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilData::SetInitApnInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilData::SetInitApnInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilData::PdpContextListUpdated(const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList)
|
||||
int32_t TelRilData::PdpContextListUpdated(const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList)
|
||||
{
|
||||
std::shared_ptr<DataCallResultList> dataCallResultList = std::make_shared<DataCallResultList>();
|
||||
if (dataCallResultList == nullptr) {
|
||||
@ -149,11 +149,11 @@ int32_t TelRilData::PdpContextListUpdated(const HDI::Ril::V1_0::DataCallResultLi
|
||||
int32_t TelRilData::GetLinkBandwidthInfo(const int32_t cid, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_GET_LINK_BANDWIDTH_INFO,
|
||||
&HDI::Ril::V1_0::IRil::GetLinkBandwidthInfo, cid);
|
||||
&HDI::Ril::V1_1::IRil::GetLinkBandwidthInfo, cid);
|
||||
}
|
||||
|
||||
int32_t TelRilData::GetLinkBandwidthInfoResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &iDataLinkBandwidthInfo)
|
||||
int32_t TelRilData::GetLinkBandwidthInfoResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &iDataLinkBandwidthInfo)
|
||||
{
|
||||
std::shared_ptr<DataLinkBandwidthInfo> dataLinkBandwidthInfo = std::make_shared<DataLinkBandwidthInfo>();
|
||||
if (dataLinkBandwidthInfo == nullptr) {
|
||||
@ -167,7 +167,7 @@ int32_t TelRilData::GetLinkBandwidthInfoResponse(const HDI::Ril::V1_0::RilRadioR
|
||||
int32_t TelRilData::SetLinkBandwidthReportingRule(
|
||||
LinkBandwidthRule linkBandwidth, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::DataLinkBandwidthReportingRule dLinkBandwidth;
|
||||
HDI::Ril::V1_1::DataLinkBandwidthReportingRule dLinkBandwidth;
|
||||
dLinkBandwidth.rat = linkBandwidth.rat;
|
||||
dLinkBandwidth.delayMs = linkBandwidth.delayMs;
|
||||
dLinkBandwidth.delayUplinkKbps = linkBandwidth.delayUplinkKbps;
|
||||
@ -179,10 +179,10 @@ int32_t TelRilData::SetLinkBandwidthReportingRule(
|
||||
TELEPHONY_LOGI("maximumUplinkKbpsSize:%{public}d, maximumDownlinkKbpsSize:%{public}d",
|
||||
dLinkBandwidth.maximumUplinkKbpsSize, dLinkBandwidth.maximumDownlinkKbpsSize);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_SET_LINK_BANDWIDTH_REPORTING_RULE,
|
||||
&HDI::Ril::V1_0::IRil::SetLinkBandwidthReportingRule, dLinkBandwidth);
|
||||
&HDI::Ril::V1_1::IRil::SetLinkBandwidthReportingRule, dLinkBandwidth);
|
||||
}
|
||||
|
||||
int32_t TelRilData::SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilData::SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
@ -190,16 +190,16 @@ int32_t TelRilData::SetLinkBandwidthReportingRuleResponse(const HDI::Ril::V1_0::
|
||||
int32_t TelRilData::SetDataPermitted(const int32_t dataPermitted, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_DATA_SET_DATA_PERMITTED,
|
||||
&HDI::Ril::V1_0::IRil::SetDataPermitted, dataPermitted);
|
||||
&HDI::Ril::V1_1::IRil::SetDataPermitted, dataPermitted);
|
||||
}
|
||||
|
||||
int32_t TelRilData::SetDataPermittedResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilData::SetDataPermittedResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
void TelRilData::BuildDataCallResultList(std::shared_ptr<DataCallResultList> dataCallResultList,
|
||||
const HDI::Ril::V1_0::DataCallResultList &iDataCallResultList)
|
||||
const HDI::Ril::V1_1::DataCallResultList &iDataCallResultList)
|
||||
{
|
||||
dataCallResultList->size = iDataCallResultList.size;
|
||||
for (auto dc : iDataCallResultList.dcList) {
|
||||
@ -224,7 +224,7 @@ void TelRilData::BuildDataCallResultList(std::shared_ptr<DataCallResultList> dat
|
||||
}
|
||||
|
||||
void TelRilData::BuildDataCallResultInfo(std::shared_ptr<SetupDataCallResultInfo> dataCallResult,
|
||||
const HDI::Ril::V1_0::SetupDataCallResultInfo &iSetupDataCallResultInfo)
|
||||
const HDI::Ril::V1_1::SetupDataCallResultInfo &iSetupDataCallResultInfo)
|
||||
{
|
||||
dataCallResult->flag = iSetupDataCallResultInfo.flag;
|
||||
dataCallResult->reason = iSetupDataCallResultInfo.reason;
|
||||
@ -244,7 +244,7 @@ void TelRilData::BuildDataCallResultInfo(std::shared_ptr<SetupDataCallResultInfo
|
||||
}
|
||||
|
||||
void TelRilData::BuildDataLinkBandwidthInfo(std::shared_ptr<DataLinkBandwidthInfo> dataLinkBandwidthInfo,
|
||||
const HDI::Ril::V1_0::DataLinkBandwidthInfo &iDataLinkBandwidthInfo)
|
||||
const HDI::Ril::V1_1::DataLinkBandwidthInfo &iDataLinkBandwidthInfo)
|
||||
{
|
||||
dataLinkBandwidthInfo->serial = iDataLinkBandwidthInfo.serial;
|
||||
dataLinkBandwidthInfo->cid = iDataLinkBandwidthInfo.cid;
|
||||
|
||||
@ -59,7 +59,7 @@ bool TelRilManager::DeInit()
|
||||
|
||||
bool TelRilManager::ConnectRilInterface()
|
||||
{
|
||||
rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
if (rilInterface_ == nullptr) {
|
||||
TELEPHONY_LOGE("TelRilManager not find RilInterfaceService");
|
||||
return false;
|
||||
|
||||
@ -24,12 +24,12 @@
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilModem::TelRilModem(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilModem::TelRilModem(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
|
||||
int32_t TelRilModem::SetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilModem::SetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
auto getDataFunc = [&responseInfo](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::unique_ptr<HRilRadioStateInfo> radioState = std::make_unique<HRilRadioStateInfo>();
|
||||
@ -40,7 +40,7 @@ int32_t TelRilModem::SetRadioStateResponse(const HDI::Ril::V1_0::RilRadioRespons
|
||||
return Response<std::unique_ptr<HRilRadioStateInfo>>(TELEPHONY_LOG_FUNC_NAME, responseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetRadioStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
int32_t TelRilModem::GetRadioStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t state)
|
||||
{
|
||||
auto getDataFunc = [state](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::unique_ptr<HRilRadioStateInfo> radioState = std::make_unique<HRilRadioStateInfo>();
|
||||
@ -53,60 +53,60 @@ int32_t TelRilModem::GetRadioStateResponse(const HDI::Ril::V1_0::RilRadioRespons
|
||||
|
||||
int32_t TelRilModem::ShutDown(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_SHUT_DOWN, &HDI::Ril::V1_0::IRil::ShutDown);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_SHUT_DOWN, &HDI::Ril::V1_1::IRil::ShutDown);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::SetRadioState(int32_t fun, int32_t rst, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_SET_RADIO_STATUS, &HDI::Ril::V1_0::IRil::SetRadioState, fun, rst);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_SET_RADIO_STATUS, &HDI::Ril::V1_1::IRil::SetRadioState, fun, rst);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetRadioState(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_RADIO_STATUS, &HDI::Ril::V1_0::IRil::GetRadioState);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_RADIO_STATUS, &HDI::Ril::V1_1::IRil::GetRadioState);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetImei(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_IMEI, &HDI::Ril::V1_0::IRil::GetImei);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_IMEI, &HDI::Ril::V1_1::IRil::GetImei);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetMeid(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_MEID, &HDI::Ril::V1_0::IRil::GetMeid);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_MEID, &HDI::Ril::V1_1::IRil::GetMeid);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetVoiceRadioTechnology(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_VOICE_RADIO, &HDI::Ril::V1_0::IRil::GetVoiceRadioTechnology);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_VOICE_RADIO, &HDI::Ril::V1_1::IRil::GetVoiceRadioTechnology);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetBasebandVersion(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_BASEBAND_VERSION, &HDI::Ril::V1_0::IRil::GetBasebandVersion);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_MODEM_GET_BASEBAND_VERSION, &HDI::Ril::V1_1::IRil::GetBasebandVersion);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::ShutDownResponse(const HDI::Ril::V1_0::RilRadioResponseInfo responseInfo)
|
||||
int32_t TelRilModem::ShutDownResponse(const HDI::Ril::V1_1::RilRadioResponseInfo responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetImeiResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &imei)
|
||||
int32_t TelRilModem::GetImeiResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &imei)
|
||||
{
|
||||
return Response<HRilStringParcel>(TELEPHONY_LOG_FUNC_NAME, responseInfo, std::make_shared<HRilStringParcel>(imei));
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetMeidResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &meid)
|
||||
int32_t TelRilModem::GetMeidResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &meid)
|
||||
{
|
||||
return Response<HRilStringParcel>(TELEPHONY_LOG_FUNC_NAME, responseInfo, std::make_shared<HRilStringParcel>(meid));
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
int32_t TelRilModem::GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
{
|
||||
std::shared_ptr<VoiceRadioTechnology> mVoiceRadioTechnology = std::make_shared<VoiceRadioTechnology>();
|
||||
BuildVoiceRadioTechnology(voiceRadioTechnology, mVoiceRadioTechnology);
|
||||
@ -114,7 +114,7 @@ int32_t TelRilModem::GetVoiceRadioTechnologyResponse(const HDI::Ril::V1_0::RilRa
|
||||
}
|
||||
|
||||
int32_t TelRilModem::GetBasebandVersionResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &basebandVersion)
|
||||
{
|
||||
return Response<HRilStringParcel>(
|
||||
TELEPHONY_LOG_FUNC_NAME, responseInfo, std::make_shared<HRilStringParcel>(basebandVersion));
|
||||
@ -133,7 +133,7 @@ int32_t TelRilModem::RadioStateUpdated(int32_t state)
|
||||
TELEPHONY_LOG_FUNC_NAME, std::make_shared<HRilInt32Parcel>(state), RadioEvent::RADIO_STATE_CHANGED);
|
||||
}
|
||||
|
||||
int32_t TelRilModem::VoiceRadioTechUpdated(const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
int32_t TelRilModem::VoiceRadioTechUpdated(const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology)
|
||||
{
|
||||
std::shared_ptr<VoiceRadioTechnology> mVoiceRadioTechnology = std::make_shared<VoiceRadioTechnology>();
|
||||
BuildVoiceRadioTechnology(voiceRadioTechnology, mVoiceRadioTechnology);
|
||||
@ -141,7 +141,7 @@ int32_t TelRilModem::VoiceRadioTechUpdated(const HDI::Ril::V1_0::VoiceRadioTechn
|
||||
TELEPHONY_LOG_FUNC_NAME, mVoiceRadioTechnology, RadioEvent::RADIO_VOICE_TECH_CHANGED);
|
||||
}
|
||||
|
||||
void TelRilModem::BuildVoiceRadioTechnology(const HDI::Ril::V1_0::VoiceRadioTechnology &voiceRadioTechnology,
|
||||
void TelRilModem::BuildVoiceRadioTechnology(const HDI::Ril::V1_1::VoiceRadioTechnology &voiceRadioTechnology,
|
||||
std::shared_ptr<VoiceRadioTechnology> &mVoiceRadioTechnology)
|
||||
{
|
||||
if (mVoiceRadioTechnology == nullptr) {
|
||||
|
||||
@ -26,7 +26,7 @@ using OHOS::IRemoteObject;
|
||||
using OHOS::sptr;
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilNetwork::TelRilNetwork(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilNetwork::TelRilNetwork(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
@ -34,114 +34,114 @@ TelRilNetwork::TelRilNetwork(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInter
|
||||
int32_t TelRilNetwork::GetSignalStrength(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_SIGNAL_STRENGTH, &HDI::Ril::V1_0::IRil::GetSignalStrength);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_SIGNAL_STRENGTH, &HDI::Ril::V1_1::IRil::GetSignalStrength);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetCsRegStatus(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_CS_REG_STATUS, &HDI::Ril::V1_0::IRil::GetCsRegStatus);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_CS_REG_STATUS, &HDI::Ril::V1_1::IRil::GetCsRegStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPsRegStatus(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_PS_REG_STATUS, &HDI::Ril::V1_0::IRil::GetPsRegStatus);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_PS_REG_STATUS, &HDI::Ril::V1_1::IRil::GetPsRegStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetOperatorInfo(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_OPERATOR_INFO, &HDI::Ril::V1_0::IRil::GetOperatorInfo);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_OPERATOR_INFO, &HDI::Ril::V1_1::IRil::GetOperatorInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetNetworkSearchInformation(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_NETWORK_SEARCH_INFORMATION,
|
||||
&HDI::Ril::V1_0::IRil::GetNetworkSearchInformation);
|
||||
&HDI::Ril::V1_1::IRil::GetNetworkSearchInformation);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetNetworkSelectionMode(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_NETWORK_SELECTION_MODE,
|
||||
&HDI::Ril::V1_0::IRil::GetNetworkSelectionMode);
|
||||
&HDI::Ril::V1_1::IRil::GetNetworkSelectionMode);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetNetworkSelectionMode(
|
||||
int32_t automaticFlag, std::string oper, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::SetNetworkModeInfo setNetworkModeInfo;
|
||||
HDI::Ril::V1_1::SetNetworkModeInfo setNetworkModeInfo;
|
||||
setNetworkModeInfo.selectMode = automaticFlag;
|
||||
setNetworkModeInfo.oper = oper;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_SET_NETWORK_SELECTION_MODE,
|
||||
&HDI::Ril::V1_0::IRil::SetNetworkSelectionMode, setNetworkModeInfo);
|
||||
&HDI::Ril::V1_1::IRil::SetNetworkSelectionMode, setNetworkModeInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetPreferredNetwork(
|
||||
int32_t preferredNetworkType, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_SET_PREFERRED_NETWORK,
|
||||
&HDI::Ril::V1_0::IRil::SetPreferredNetwork, preferredNetworkType);
|
||||
&HDI::Ril::V1_1::IRil::SetPreferredNetwork, preferredNetworkType);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPreferredNetwork(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_PREFERRED_NETWORK,
|
||||
&HDI::Ril::V1_0::IRil::GetPreferredNetwork);
|
||||
&HDI::Ril::V1_1::IRil::GetPreferredNetwork);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetCellInfoList(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_NEIGHBORING_CELLINFO_LIST,
|
||||
&HDI::Ril::V1_0::IRil::GetNeighboringCellInfoList);
|
||||
&HDI::Ril::V1_1::IRil::GetNeighboringCellInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetCurrentCellInfo(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_CURRENT_CELL_INFO,
|
||||
&HDI::Ril::V1_0::IRil::GetCurrentCellInfo);
|
||||
&HDI::Ril::V1_1::IRil::GetCurrentCellInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPhysicalChannelConfig(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_GET_PHYSICAL_CHANNEL_CONFIG,
|
||||
&HDI::Ril::V1_0::IRil::GetPhysicalChannelConfig);
|
||||
&HDI::Ril::V1_1::IRil::GetPhysicalChannelConfig);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetLocateUpdates(HRilRegNotifyMode mode, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_SET_LOCATE_UPDATES,
|
||||
&HDI::Ril::V1_0::IRil::SetLocateUpdates, static_cast<HDI::Ril::V1_0::RilRegNotifyMode>(mode));
|
||||
&HDI::Ril::V1_1::IRil::SetLocateUpdates, static_cast<HDI::Ril::V1_1::RilRegNotifyMode>(mode));
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetNotificationFilter(int32_t newFilter, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_SET_NOTIFICATION_FILTER,
|
||||
&HDI::Ril::V1_0::IRil::SetNotificationFilter, newFilter);
|
||||
&HDI::Ril::V1_1::IRil::SetNotificationFilter, newFilter);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetDeviceState(
|
||||
int32_t deviceStateType, bool deviceStateOn, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_NETWORK_SET_DEVICE_STATE,
|
||||
&HDI::Ril::V1_0::IRil::SetDeviceState, deviceStateType, deviceStateOn);
|
||||
&HDI::Ril::V1_1::IRil::SetDeviceState, deviceStateType, deviceStateOn);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SignalStrengthUpdated(const HDI::Ril::V1_0::Rssi &rssi)
|
||||
int32_t TelRilNetwork::SignalStrengthUpdated(const HDI::Ril::V1_1::Rssi &rssi)
|
||||
{
|
||||
std::shared_ptr<Rssi> signalStrength = std::make_shared<Rssi>();
|
||||
BuildSignalStrength(signalStrength, rssi);
|
||||
return Notify<Rssi>(TELEPHONY_LOG_FUNC_NAME, signalStrength, RadioEvent::RADIO_SIGNAL_STRENGTH_UPDATE);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::NetworkCsRegStatusUpdated(const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo)
|
||||
int32_t TelRilNetwork::NetworkCsRegStatusUpdated(const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo)
|
||||
{
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo = std::make_shared<CsRegStatusInfo>();
|
||||
BuildCsRegStatusInfo(regStatusInfo, csRegStatusInfo);
|
||||
return Notify<CsRegStatusInfo>(TELEPHONY_LOG_FUNC_NAME, regStatusInfo, RadioEvent::RADIO_NETWORK_STATE);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::NetworkPsRegStatusUpdated(const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo)
|
||||
int32_t TelRilNetwork::NetworkPsRegStatusUpdated(const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo)
|
||||
{
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo = std::make_shared<PsRegStatusResultInfo>();
|
||||
BuildPsRegStatusInfo(regStatusInfo, psRegStatusInfo);
|
||||
@ -160,7 +160,7 @@ int32_t TelRilNetwork::NetworkTimeUpdated(const std::string &timeStr)
|
||||
TELEPHONY_LOG_FUNC_NAME, std::make_shared<std::string>(timeStr), RadioEvent::RADIO_NETWORK_TIME_UPDATE);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList)
|
||||
int32_t TelRilNetwork::NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList)
|
||||
{
|
||||
std::shared_ptr<ChannelConfigInfoList> channelConfigList = std::make_shared<ChannelConfigInfoList>();
|
||||
BuildChannelConfigInfoList(channelConfigList, channelConfigInfoList);
|
||||
@ -168,7 +168,7 @@ int32_t TelRilNetwork::NetworkPhyChnlCfgUpdated(const HDI::Ril::V1_0::ChannelCon
|
||||
TELEPHONY_LOG_FUNC_NAME, channelConfigList, RadioEvent::RADIO_CHANNEL_CONFIG_UPDATE);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::NetworkCurrentCellUpdated(const HDI::Ril::V1_0::CellListCurrentInfo &cellListCurrentInfo)
|
||||
int32_t TelRilNetwork::NetworkCurrentCellUpdated(const HDI::Ril::V1_1::CellListCurrentInfo &cellListCurrentInfo)
|
||||
{
|
||||
std::shared_ptr<CellListCurrentInfo> currentCellList = std::make_shared<CellListCurrentInfo>();
|
||||
BuildCurrentCellInfoList(currentCellList, cellListCurrentInfo);
|
||||
@ -176,7 +176,7 @@ int32_t TelRilNetwork::NetworkCurrentCellUpdated(const HDI::Ril::V1_0::CellListC
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetSignalStrengthResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::Rssi &rssi)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::Rssi &rssi)
|
||||
{
|
||||
std::shared_ptr<Rssi> signalStrength = std::make_shared<Rssi>();
|
||||
BuildSignalStrength(signalStrength, rssi);
|
||||
@ -184,7 +184,7 @@ int32_t TelRilNetwork::GetSignalStrengthResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetCsRegStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo)
|
||||
{
|
||||
auto getDataFunc = [&csRegStatusInfo, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo = std::make_shared<CsRegStatusInfo>();
|
||||
@ -196,7 +196,7 @@ int32_t TelRilNetwork::GetCsRegStatusResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPsRegStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo)
|
||||
{
|
||||
auto getDataFunc = [&psRegStatusInfo, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo = std::make_shared<PsRegStatusResultInfo>();
|
||||
@ -208,15 +208,15 @@ int32_t TelRilNetwork::GetPsRegStatusResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetOperatorInfoResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::OperatorInfo &operatorInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::OperatorInfo &operatorInfo)
|
||||
{
|
||||
std::shared_ptr<OperatorInfoResult> operatorResult = std::make_shared<OperatorInfoResult>();
|
||||
BuildOperatorInfo(operatorResult, operatorInfo);
|
||||
return Response<OperatorInfoResult>(TELEPHONY_LOG_FUNC_NAME, responseInfo, operatorResult);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetNetworkSearchInformationResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList)
|
||||
int32_t TelRilNetwork::GetNetworkSearchInformationResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList)
|
||||
{
|
||||
auto getDataFunc = [&availableNetworkList, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<AvailableNetworkList> availableNetworkInfos = std::make_shared<AvailableNetworkList>();
|
||||
@ -227,8 +227,8 @@ int32_t TelRilNetwork::GetNetworkSearchInformationResponse(const HDI::Ril::V1_0:
|
||||
return Response<AvailableNetworkList>(TELEPHONY_LOG_FUNC_NAME, responseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
int32_t TelRilNetwork::GetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
{
|
||||
auto getDataFunc = [&setNetworkModeInfo, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<SetNetworkModeInfo> networkModeInfo = std::make_shared<SetNetworkModeInfo>();
|
||||
@ -239,13 +239,13 @@ int32_t TelRilNetwork::GetNetworkSelectionModeResponse(const HDI::Ril::V1_0::Ril
|
||||
return Response<SetNetworkModeInfo>(TELEPHONY_LOG_FUNC_NAME, responseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetNetworkSelectionModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilNetwork::SetNetworkSelectionModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetNeighboringCellInfoListResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList)
|
||||
{
|
||||
std::shared_ptr<CellListNearbyInfo> cellListNearbyInfo = std::make_shared<CellListNearbyInfo>();
|
||||
BuildNeighboringCellInfoList(cellListNearbyInfo, cellInfoList);
|
||||
@ -253,20 +253,20 @@ int32_t TelRilNetwork::GetNeighboringCellInfoListResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetCurrentCellInfoResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList)
|
||||
{
|
||||
std::shared_ptr<CellListCurrentInfo> currentCellList = std::make_shared<CellListCurrentInfo>();
|
||||
BuildCurrentCellInfoList(currentCellList, cellInfoList);
|
||||
return Response<CellListCurrentInfo>(TELEPHONY_LOG_FUNC_NAME, responseInfo, currentCellList);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilNetwork::SetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::PreferredNetworkTypeInfo &preferredNetworkTypeInfo)
|
||||
int32_t TelRilNetwork::GetPreferredNetworkResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::PreferredNetworkTypeInfo &preferredNetworkTypeInfo)
|
||||
{
|
||||
auto getDataFunc = [&preferredNetworkTypeInfo](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<PreferredNetworkTypeInfo> preferredTypeInfo = std::make_shared<PreferredNetworkTypeInfo>();
|
||||
@ -277,8 +277,8 @@ int32_t TelRilNetwork::GetPreferredNetworkResponse(const HDI::Ril::V1_0::RilRadi
|
||||
return Response<PreferredNetworkTypeInfo>(TELEPHONY_LOG_FUNC_NAME, responseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::GetPhysicalChannelConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList)
|
||||
int32_t TelRilNetwork::GetPhysicalChannelConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList)
|
||||
{
|
||||
auto getDataFunc = [&channelConfigInfoList, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<ChannelConfigInfoList> channelConfigList = std::make_shared<ChannelConfigInfoList>();
|
||||
@ -289,22 +289,22 @@ int32_t TelRilNetwork::GetPhysicalChannelConfigResponse(const HDI::Ril::V1_0::Ri
|
||||
return Response<ChannelConfigInfoList>(TELEPHONY_LOG_FUNC_NAME, responseInfo, getDataFunc);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetLocateUpdatesResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilNetwork::SetLocateUpdatesResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetNotificationFilterResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilNetwork::SetNotificationFilterResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilNetwork::SetDeviceStateResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilNetwork::SetDeviceStateResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildSignalStrength(std::shared_ptr<Rssi> signalStrength, const HDI::Ril::V1_0::Rssi &rssi)
|
||||
void TelRilNetwork::BuildSignalStrength(std::shared_ptr<Rssi> signalStrength, const HDI::Ril::V1_1::Rssi &rssi)
|
||||
{
|
||||
signalStrength->gw.rxlev = rssi.gw.rxlev;
|
||||
signalStrength->gw.ber = rssi.gw.ber;
|
||||
@ -325,7 +325,7 @@ void TelRilNetwork::BuildSignalStrength(std::shared_ptr<Rssi> signalStrength, co
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildCsRegStatusInfo(
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo, const HDI::Ril::V1_0::CsRegStatusInfo &csRegStatusInfo)
|
||||
std::shared_ptr<CsRegStatusInfo> regStatusInfo, const HDI::Ril::V1_1::CsRegStatusInfo &csRegStatusInfo)
|
||||
{
|
||||
regStatusInfo->notifyType = csRegStatusInfo.notifyType;
|
||||
regStatusInfo->regStatus = static_cast<HRilRegStatus>(csRegStatusInfo.regStatus);
|
||||
@ -335,7 +335,7 @@ void TelRilNetwork::BuildCsRegStatusInfo(
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildPsRegStatusInfo(
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo, const HDI::Ril::V1_0::PsRegStatusInfo &psRegStatusInfo)
|
||||
std::shared_ptr<PsRegStatusResultInfo> regStatusInfo, const HDI::Ril::V1_1::PsRegStatusInfo &psRegStatusInfo)
|
||||
{
|
||||
regStatusInfo->notifyType = psRegStatusInfo.notifyType;
|
||||
regStatusInfo->regStatus = static_cast<HRilRegStatus>(psRegStatusInfo.regStatus);
|
||||
@ -348,7 +348,7 @@ void TelRilNetwork::BuildPsRegStatusInfo(
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildOperatorInfo(
|
||||
std::shared_ptr<OperatorInfoResult> operatorInfoResult, const HDI::Ril::V1_0::OperatorInfo &operatorInfo)
|
||||
std::shared_ptr<OperatorInfoResult> operatorInfoResult, const HDI::Ril::V1_1::OperatorInfo &operatorInfo)
|
||||
{
|
||||
operatorInfoResult->longName = operatorInfo.longName;
|
||||
operatorInfoResult->shortName = operatorInfo.shortName;
|
||||
@ -356,7 +356,7 @@ void TelRilNetwork::BuildOperatorInfo(
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildAvailableNetworkList(std::shared_ptr<AvailableNetworkList> availableNetworkInfos,
|
||||
const HDI::Ril::V1_0::AvailableNetworkList &availableNetworkList)
|
||||
const HDI::Ril::V1_1::AvailableNetworkList &availableNetworkList)
|
||||
{
|
||||
AvailableNetworkInfo operInfo = {};
|
||||
availableNetworkInfos->itemNum = availableNetworkList.itemNum;
|
||||
@ -372,14 +372,14 @@ void TelRilNetwork::BuildAvailableNetworkList(std::shared_ptr<AvailableNetworkLi
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildNetworkModeInfo(
|
||||
std::shared_ptr<SetNetworkModeInfo> networkModeInfo, const HDI::Ril::V1_0::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
std::shared_ptr<SetNetworkModeInfo> networkModeInfo, const HDI::Ril::V1_1::SetNetworkModeInfo &setNetworkModeInfo)
|
||||
{
|
||||
networkModeInfo->selectMode = setNetworkModeInfo.selectMode;
|
||||
networkModeInfo->oper = setNetworkModeInfo.oper;
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildNeighboringCellInfoList(
|
||||
std::shared_ptr<CellListNearbyInfo> cellListNearbyInfo, const HDI::Ril::V1_0::CellListNearbyInfo &cellInfoList)
|
||||
std::shared_ptr<CellListNearbyInfo> cellListNearbyInfo, const HDI::Ril::V1_1::CellListNearbyInfo &cellInfoList)
|
||||
{
|
||||
cellListNearbyInfo->itemNum = cellInfoList.itemNum;
|
||||
for (auto info : cellInfoList.cellNearbyInfo) {
|
||||
@ -389,7 +389,7 @@ void TelRilNetwork::BuildNeighboringCellInfoList(
|
||||
}
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillGsmCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillGsmCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.gsm.band = info.serviceCells.gsm.band;
|
||||
cellInfo.ServiceCellParas.gsm.arfcn = info.serviceCells.gsm.arfcn;
|
||||
@ -399,7 +399,7 @@ void TelRilNetwork::FillGsmCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::R
|
||||
cellInfo.ServiceCellParas.gsm.rxlev = info.serviceCells.gsm.rxlev;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillLteCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillLteCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.lte.arfcn = info.serviceCells.lte.arfcn;
|
||||
cellInfo.ServiceCellParas.lte.pci = info.serviceCells.lte.pci;
|
||||
@ -408,7 +408,7 @@ void TelRilNetwork::FillLteCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::R
|
||||
cellInfo.ServiceCellParas.lte.rxlev = info.serviceCells.lte.rxlev;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillWcdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillWcdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.wcdma.arfcn = info.serviceCells.wcdma.arfcn;
|
||||
cellInfo.ServiceCellParas.wcdma.psc = info.serviceCells.wcdma.psc;
|
||||
@ -416,7 +416,7 @@ void TelRilNetwork::FillWcdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI:
|
||||
cellInfo.ServiceCellParas.wcdma.ecno = info.serviceCells.wcdma.ecno;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillCdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillCdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.cdma.systemId = info.serviceCells.cdma.systemId;
|
||||
cellInfo.ServiceCellParas.cdma.networkId = info.serviceCells.cdma.networkId;
|
||||
@ -430,7 +430,7 @@ void TelRilNetwork::FillCdmaCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillTdscdmaCellNearbyInfo(
|
||||
CellNearbyInfo &cellNearbyInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
CellNearbyInfo &cellNearbyInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellNearbyInfo.ServiceCellParas.tdscdma.arfcn = info.serviceCells.tdscdma.arfcn;
|
||||
cellNearbyInfo.ServiceCellParas.tdscdma.syncId = info.serviceCells.tdscdma.syncId;
|
||||
@ -443,7 +443,7 @@ void TelRilNetwork::FillTdscdmaCellNearbyInfo(
|
||||
cellNearbyInfo.ServiceCellParas.tdscdma.cpid = info.serviceCells.tdscdma.cpid;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillNrCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillNrCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.nr.nrArfcn = info.serviceCells.nr.nrArfcn;
|
||||
cellInfo.ServiceCellParas.nr.pci = info.serviceCells.nr.pci;
|
||||
@ -451,7 +451,7 @@ void TelRilNetwork::FillNrCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ri
|
||||
cellInfo.ServiceCellParas.nr.nci = info.serviceCells.nr.nci;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_0::CellNearbyInfo &info)
|
||||
void TelRilNetwork::FillCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril::V1_1::CellNearbyInfo &info)
|
||||
{
|
||||
cellInfo.ratType = info.ratType;
|
||||
switch (info.ratType) {
|
||||
@ -480,7 +480,7 @@ void TelRilNetwork::FillCellNearbyInfo(CellNearbyInfo &cellInfo, const HDI::Ril:
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildCurrentCellInfoList(
|
||||
std::shared_ptr<CellListCurrentInfo> currentCellList, const HDI::Ril::V1_0::CellListCurrentInfo &cellInfoList)
|
||||
std::shared_ptr<CellListCurrentInfo> currentCellList, const HDI::Ril::V1_1::CellListCurrentInfo &cellInfoList)
|
||||
{
|
||||
currentCellList->itemNum = cellInfoList.itemNum;
|
||||
for (auto &info : cellInfoList.cellCurrentInfo) {
|
||||
@ -490,7 +490,7 @@ void TelRilNetwork::BuildCurrentCellInfoList(
|
||||
}
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ratType = info.ratType;
|
||||
cellInfo.mcc = info.mcc;
|
||||
@ -520,7 +520,7 @@ void TelRilNetwork::FillCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ri
|
||||
}
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillGsmCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillGsmCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.gsm.band = info.serviceCells.gsm.band;
|
||||
cellInfo.ServiceCellParas.gsm.arfcn = info.serviceCells.gsm.arfcn;
|
||||
@ -532,7 +532,7 @@ void TelRilNetwork::FillGsmCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI:
|
||||
cellInfo.ServiceCellParas.gsm.ta = info.serviceCells.gsm.ta;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillLteCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillLteCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.lte.arfcn = info.serviceCells.lte.arfcn;
|
||||
cellInfo.ServiceCellParas.lte.cellId = info.serviceCells.lte.cellId;
|
||||
@ -543,7 +543,7 @@ void TelRilNetwork::FillLteCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI:
|
||||
cellInfo.ServiceCellParas.lte.rssi = info.serviceCells.lte.rssi;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillWcdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillWcdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.wcdma.arfcn = info.serviceCells.wcdma.arfcn;
|
||||
cellInfo.ServiceCellParas.wcdma.cellId = info.serviceCells.wcdma.cellId;
|
||||
@ -556,7 +556,7 @@ void TelRilNetwork::FillWcdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HD
|
||||
cellInfo.ServiceCellParas.wcdma.drx = info.serviceCells.wcdma.drx;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillCdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillCdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.cdma.systemId = info.serviceCells.cdma.systemId;
|
||||
cellInfo.ServiceCellParas.cdma.networkId = info.serviceCells.cdma.networkId;
|
||||
@ -570,7 +570,7 @@ void TelRilNetwork::FillCdmaCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillTdscdmaCurrentCellInfo(
|
||||
CurrentCellInfo ¤tCellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
CurrentCellInfo ¤tCellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
currentCellInfo.ServiceCellParas.tdscdma.arfcn = info.serviceCells.tdscdma.arfcn;
|
||||
currentCellInfo.ServiceCellParas.tdscdma.syncId = info.serviceCells.tdscdma.syncId;
|
||||
@ -583,7 +583,7 @@ void TelRilNetwork::FillTdscdmaCurrentCellInfo(
|
||||
currentCellInfo.ServiceCellParas.tdscdma.cpid = info.serviceCells.tdscdma.cpid;
|
||||
}
|
||||
|
||||
void TelRilNetwork::FillNrCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_0::CurrentCellInfo &info)
|
||||
void TelRilNetwork::FillNrCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::Ril::V1_1::CurrentCellInfo &info)
|
||||
{
|
||||
cellInfo.ServiceCellParas.nr.nrArfcn = info.serviceCells.nr.nrArfcn;
|
||||
cellInfo.ServiceCellParas.nr.pci = info.serviceCells.nr.pci;
|
||||
@ -592,7 +592,7 @@ void TelRilNetwork::FillNrCurrentCellInfo(CurrentCellInfo &cellInfo, const HDI::
|
||||
}
|
||||
|
||||
void TelRilNetwork::BuildChannelConfigInfoList(std::shared_ptr<ChannelConfigInfoList> channelConfigList,
|
||||
const HDI::Ril::V1_0::ChannelConfigInfoList &channelConfigInfoList)
|
||||
const HDI::Ril::V1_1::ChannelConfigInfoList &channelConfigInfoList)
|
||||
{
|
||||
channelConfigList->itemNum = channelConfigInfoList.itemNum;
|
||||
for (int32_t i = 0; i < channelConfigList->itemNum; i++) {
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilSim::TelRilSim(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilSim::TelRilSim(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
@ -67,7 +67,7 @@ int32_t TelRilSim::SimRefreshNotify()
|
||||
return Notify(TELEPHONY_LOG_FUNC_NAME, RadioEvent::RADIO_ICC_REFRESH);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimRadioProtocolUpdated(const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
int32_t TelRilSim::SimRadioProtocolUpdated(const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
std::shared_ptr<RadioProtocol> protocol = std::make_shared<RadioProtocol>();
|
||||
BuildRadioProtocol(protocol, radioProtocol);
|
||||
@ -76,7 +76,7 @@ int32_t TelRilSim::SimRadioProtocolUpdated(const HDI::Ril::V1_0::RadioProtocol &
|
||||
|
||||
// response
|
||||
int32_t TelRilSim::GetSimIOResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return ResponseIccIo(responseInfo, result);
|
||||
}
|
||||
@ -148,26 +148,26 @@ int32_t TelRilSim::ProcessIccIoInfo(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetSimStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CardStatusInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CardStatusInfo &result)
|
||||
{
|
||||
std::shared_ptr<CardStatusInfo> cardStatusInfo = std::make_shared<CardStatusInfo>();
|
||||
BuildCardStatusInfo(cardStatusInfo, result);
|
||||
return Response<CardStatusInfo>(TELEPHONY_LOG_FUNC_NAME, responseInfo, cardStatusInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetImsiResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const std::string &result)
|
||||
int32_t TelRilSim::GetImsiResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const std::string &result)
|
||||
{
|
||||
return Response<std::string>(TELEPHONY_LOG_FUNC_NAME, responseInfo, std::make_shared<std::string>(result));
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetSimLockStatusResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, int32_t simLockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t simLockStatus)
|
||||
{
|
||||
return Response<int32_t>(TELEPHONY_LOG_FUNC_NAME, responseInfo, std::make_shared<int32_t>(simLockStatus));
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -175,7 +175,7 @@ int32_t TelRilSim::SetSimLockResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::ChangeSimPasswordResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -183,7 +183,7 @@ int32_t TelRilSim::ChangeSimPasswordResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPinResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -191,7 +191,7 @@ int32_t TelRilSim::UnlockPinResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPukResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -199,7 +199,7 @@ int32_t TelRilSim::UnlockPukResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPin2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -207,40 +207,40 @@ int32_t TelRilSim::UnlockPin2Response(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPuk2Response(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
return Response<LockStatusResp>(TELEPHONY_LOG_FUNC_NAME, responseInfo, lockStatusResp);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetActiveSimResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SetActiveSimResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendTerminalResponseResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SimStkSendTerminalResponseResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendEnvelopeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SimStkSendEnvelopeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SimStkSendCallSetupRequestResultResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkIsReadyResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SimStkIsReadyResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
std::shared_ptr<RadioProtocol> protocol = std::make_shared<RadioProtocol>();
|
||||
BuildRadioProtocol(protocol, radioProtocol);
|
||||
@ -248,46 +248,46 @@ int32_t TelRilSim::GetRadioProtocolResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetRadioProtocolResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
std::shared_ptr<RadioProtocol> protocol = std::make_shared<RadioProtocol>();
|
||||
BuildRadioProtocol(protocol, radioProtocol);
|
||||
return Response<RadioProtocol>(TELEPHONY_LOG_FUNC_NAME, responseInfo, protocol);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimOpenLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
int32_t TelRilSim::SimOpenLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
{
|
||||
std::shared_ptr<OpenLogicalChannelResponse> openLogicalChannelResp = std::make_shared<OpenLogicalChannelResponse>();
|
||||
BuildOpenLogicalChannelResp(openLogicalChannelResp, pOpenLogicalChannelResponse);
|
||||
return Response<OpenLogicalChannelResponse>(TELEPHONY_LOG_FUNC_NAME, responseInfo, openLogicalChannelResp);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimCloseLogicalChannelResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSim::SimCloseLogicalChannelResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimTransmitApduLogicalChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return ResponseIccIo(responseInfo, result);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimTransmitApduBasicChannelResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return ResponseIccIo(responseInfo, result);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimAuthenticationResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
return ResponseIccIo(responseInfo, result);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockSimLockResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp = std::make_shared<LockStatusResp>();
|
||||
BuildLockStatusResp(lockStatusResp, lockStatus);
|
||||
@ -296,12 +296,12 @@ int32_t TelRilSim::UnlockSimLockResponse(
|
||||
|
||||
int32_t TelRilSim::GetSimStatus(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_SIM_GET_SIM_STATUS, &HDI::Ril::V1_0::IRil::GetSimStatus);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_SIM_GET_SIM_STATUS, &HDI::Ril::V1_1::IRil::GetSimStatus);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetSimIO(SimIoRequestInfo simIoInfo, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SimIoRequestInfo iccIoRequestInfo;
|
||||
OHOS::HDI::Ril::V1_1::SimIoRequestInfo iccIoRequestInfo;
|
||||
iccIoRequestInfo.command = simIoInfo.command;
|
||||
iccIoRequestInfo.fileId = simIoInfo.fileId;
|
||||
iccIoRequestInfo.p1 = simIoInfo.p1;
|
||||
@ -311,169 +311,169 @@ int32_t TelRilSim::GetSimIO(SimIoRequestInfo simIoInfo, const AppExecFwk::InnerE
|
||||
iccIoRequestInfo.path = simIoInfo.path;
|
||||
iccIoRequestInfo.pin2 = simIoInfo.pin2;
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_GET_SIM_IO, &HDI::Ril::V1_0::IRil::GetSimIO, iccIoRequestInfo);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_GET_SIM_IO, &HDI::Ril::V1_1::IRil::GetSimIO, iccIoRequestInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetImsi(const AppExecFwk::InnerEvent::Pointer &result)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_SIM_GET_IMSI, &HDI::Ril::V1_0::IRil::GetImsi);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, result, HREQ_SIM_GET_IMSI, &HDI::Ril::V1_1::IRil::GetImsi);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::GetSimLockStatus(std::string fac, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
const int32_t MODE = 2;
|
||||
OHOS::HDI::Ril::V1_0::SimLockInfo simLockInfo;
|
||||
OHOS::HDI::Ril::V1_1::SimLockInfo simLockInfo;
|
||||
simLockInfo.fac = fac;
|
||||
simLockInfo.mode = MODE;
|
||||
simLockInfo.classx = 0;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_GET_SIM_LOCK_STATUS,
|
||||
&HDI::Ril::V1_0::IRil::GetSimLockStatus, simLockInfo);
|
||||
&HDI::Ril::V1_1::IRil::GetSimLockStatus, simLockInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetSimLock(
|
||||
std::string fac, int32_t mode, std::string passwd, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SimLockInfo simLockInfo;
|
||||
OHOS::HDI::Ril::V1_1::SimLockInfo simLockInfo;
|
||||
simLockInfo.fac = fac;
|
||||
simLockInfo.mode = mode;
|
||||
simLockInfo.passwd = passwd;
|
||||
simLockInfo.classx = 0;
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_SET_SIM_LOCK, &HDI::Ril::V1_0::IRil::SetSimLock, simLockInfo);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_SET_SIM_LOCK, &HDI::Ril::V1_1::IRil::SetSimLock, simLockInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::ChangeSimPassword(std::string fac, std::string oldPassword, std::string newPassword,
|
||||
int32_t passwordLength, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SimPasswordInfo simPwdInfo;
|
||||
OHOS::HDI::Ril::V1_1::SimPasswordInfo simPwdInfo;
|
||||
simPwdInfo.fac = fac;
|
||||
simPwdInfo.oldPassword = oldPassword;
|
||||
simPwdInfo.newPassword = newPassword;
|
||||
simPwdInfo.passwordLength = passwordLength;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_CHANGE_SIM_PASSWORD,
|
||||
&HDI::Ril::V1_0::IRil::ChangeSimPassword, simPwdInfo);
|
||||
&HDI::Ril::V1_1::IRil::ChangeSimPassword, simPwdInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPin(std::string pin, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PIN, &HDI::Ril::V1_0::IRil::UnlockPin, pin);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PIN, &HDI::Ril::V1_1::IRil::UnlockPin, pin);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPuk(std::string puk, std::string pin, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PUK, &HDI::Ril::V1_0::IRil::UnlockPuk, puk, pin);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PUK, &HDI::Ril::V1_1::IRil::UnlockPuk, puk, pin);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPin2(std::string pin2, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PIN2, &HDI::Ril::V1_0::IRil::UnlockPin2, pin2);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PIN2, &HDI::Ril::V1_1::IRil::UnlockPin2, pin2);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockPuk2(std::string puk2, std::string pin2, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PUK2, &HDI::Ril::V1_0::IRil::UnlockPuk2, puk2, pin2);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_PUK2, &HDI::Ril::V1_1::IRil::UnlockPuk2, puk2, pin2);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetActiveSim(int32_t index, int32_t enable, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_SET_ACTIVE_SIM, &HDI::Ril::V1_0::IRil::SetActiveSim, index, enable);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_SET_ACTIVE_SIM, &HDI::Ril::V1_1::IRil::SetActiveSim, index, enable);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendTerminalResponse(
|
||||
const std::string &strCmd, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_STK_SEND_TERMINAL_RESPONSE,
|
||||
&HDI::Ril::V1_0::IRil::SimStkSendTerminalResponse, strCmd);
|
||||
&HDI::Ril::V1_1::IRil::SimStkSendTerminalResponse, strCmd);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendEnvelope(const std::string &strCmd, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_STK_SEND_ENVELOPE,
|
||||
&HDI::Ril::V1_0::IRil::SimStkSendEnvelope, strCmd);
|
||||
&HDI::Ril::V1_1::IRil::SimStkSendEnvelope, strCmd);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkSendCallSetupRequestResult(bool accept, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_STK_SEND_CALL_SETUP_REQUEST_RESULT,
|
||||
&HDI::Ril::V1_0::IRil::SimStkSendCallSetupRequestResult, (int32_t)accept);
|
||||
&HDI::Ril::V1_1::IRil::SimStkSendCallSetupRequestResult, (int32_t)accept);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimStkIsReady(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_STK_IS_READY, &HDI::Ril::V1_0::IRil::SimStkIsReady);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_STK_IS_READY, &HDI::Ril::V1_1::IRil::SimStkIsReady);
|
||||
}
|
||||
|
||||
|
||||
int32_t TelRilSim::GetRadioProtocol(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_GET_RADIO_PROTOCOL, &HDI::Ril::V1_0::IRil::GetRadioProtocol);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_GET_RADIO_PROTOCOL, &HDI::Ril::V1_1::IRil::GetRadioProtocol);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SetRadioProtocol(RadioProtocol radioProtocol, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::RadioProtocol protocol;
|
||||
HDI::Ril::V1_1::RadioProtocol protocol;
|
||||
protocol.slotId = radioProtocol.slotId;
|
||||
protocol.sessionId = radioProtocol.sessionId;
|
||||
protocol.phase = static_cast<HDI::Ril::V1_0::RadioProtocolPhase>(radioProtocol.phase);
|
||||
protocol.phase = static_cast<HDI::Ril::V1_1::RadioProtocolPhase>(radioProtocol.phase);
|
||||
protocol.technology = radioProtocol.technology;
|
||||
protocol.modemId = radioProtocol.modemId;
|
||||
protocol.status = static_cast<HDI::Ril::V1_0::RadioProtocolStatus>(radioProtocol.status);
|
||||
protocol.status = static_cast<HDI::Ril::V1_1::RadioProtocolStatus>(radioProtocol.status);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_SET_RADIO_PROTOCOL,
|
||||
&HDI::Ril::V1_0::IRil::SetRadioProtocol, protocol);
|
||||
&HDI::Ril::V1_1::IRil::SetRadioProtocol, protocol);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimOpenLogicalChannel(std::string appID, int32_t p2, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_OPEN_LOGICAL_CHANNEL,
|
||||
&HDI::Ril::V1_0::IRil::SimOpenLogicalChannel, appID, p2);
|
||||
&HDI::Ril::V1_1::IRil::SimOpenLogicalChannel, appID, p2);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimCloseLogicalChannel(int32_t channelId, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_CLOSE_LOGICAL_CHANNEL,
|
||||
&HDI::Ril::V1_0::IRil::SimCloseLogicalChannel, channelId);
|
||||
&HDI::Ril::V1_1::IRil::SimCloseLogicalChannel, channelId);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimTransmitApduLogicalChannel(
|
||||
const ApduSimIORequestInfo &reqInfo, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::ApduSimIORequestInfo ApduRequestInfo;
|
||||
OHOS::HDI::Ril::V1_1::ApduSimIORequestInfo ApduRequestInfo;
|
||||
BuildApduRequestInfo(ApduRequestInfo, reqInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_TRANSMIT_APDU_LOGICAL_CHANNEL,
|
||||
&HDI::Ril::V1_0::IRil::SimTransmitApduLogicalChannel, ApduRequestInfo);
|
||||
&HDI::Ril::V1_1::IRil::SimTransmitApduLogicalChannel, ApduRequestInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimTransmitApduBasicChannel(
|
||||
const ApduSimIORequestInfo &reqInfo, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::ApduSimIORequestInfo ApduRequestInfo;
|
||||
OHOS::HDI::Ril::V1_1::ApduSimIORequestInfo ApduRequestInfo;
|
||||
BuildApduRequestInfo(ApduRequestInfo, reqInfo);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_TRANSMIT_APDU_BASIC_CHANNEL,
|
||||
&HDI::Ril::V1_0::IRil::SimTransmitApduBasicChannel, ApduRequestInfo);
|
||||
&HDI::Ril::V1_1::IRil::SimTransmitApduBasicChannel, ApduRequestInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::SimAuthentication(
|
||||
const SimAuthenticationRequestInfo &reqInfo, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SimAuthenticationRequestInfo simAuthInfo;
|
||||
OHOS::HDI::Ril::V1_1::SimAuthenticationRequestInfo simAuthInfo;
|
||||
simAuthInfo.aid = reqInfo.aid;
|
||||
simAuthInfo.authData = reqInfo.authData;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_AUTHENTICATION, &HDI::Ril::V1_0::IRil::SimAuthentication,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_AUTHENTICATION, &HDI::Ril::V1_1::IRil::SimAuthentication,
|
||||
simAuthInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSim::UnlockSimLock(
|
||||
int32_t lockType, std::string password, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_SIM_LOCK, &HDI::Ril::V1_0::IRil::UnlockSimLock,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SIM_UNLOCK_SIM_LOCK, &HDI::Ril::V1_1::IRil::UnlockSimLock,
|
||||
lockType, password);
|
||||
}
|
||||
|
||||
void TelRilSim::BuildIccIoResult(
|
||||
std::shared_ptr<IccIoResultInfo> iccIoResult, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
std::shared_ptr<IccIoResultInfo> iccIoResult, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
iccIoResult->response = result.response;
|
||||
iccIoResult->sw1 = result.sw1;
|
||||
@ -481,7 +481,7 @@ void TelRilSim::BuildIccIoResult(
|
||||
}
|
||||
|
||||
void TelRilSim::BuildCardStatusInfo(
|
||||
std::shared_ptr<CardStatusInfo> cardStatusInfo, const HDI::Ril::V1_0::CardStatusInfo &result)
|
||||
std::shared_ptr<CardStatusInfo> cardStatusInfo, const HDI::Ril::V1_1::CardStatusInfo &result)
|
||||
{
|
||||
cardStatusInfo->index = result.index;
|
||||
cardStatusInfo->simType = result.simType;
|
||||
@ -489,14 +489,14 @@ void TelRilSim::BuildCardStatusInfo(
|
||||
}
|
||||
|
||||
void TelRilSim::BuildLockStatusResp(
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp, const HDI::Ril::V1_0::LockStatusResp &lockStatus)
|
||||
std::shared_ptr<LockStatusResp> lockStatusResp, const HDI::Ril::V1_1::LockStatusResp &lockStatus)
|
||||
{
|
||||
lockStatusResp->result = lockStatus.result;
|
||||
lockStatusResp->remain = lockStatus.remain;
|
||||
}
|
||||
|
||||
void TelRilSim::BuildRadioProtocol(
|
||||
std::shared_ptr<RadioProtocol> protocol, const HDI::Ril::V1_0::RadioProtocol &radioProtocol)
|
||||
std::shared_ptr<RadioProtocol> protocol, const HDI::Ril::V1_1::RadioProtocol &radioProtocol)
|
||||
{
|
||||
protocol->slotId = radioProtocol.slotId;
|
||||
protocol->sessionId = radioProtocol.sessionId;
|
||||
@ -507,7 +507,7 @@ void TelRilSim::BuildRadioProtocol(
|
||||
}
|
||||
|
||||
void TelRilSim::BuildOpenLogicalChannelResp(std::shared_ptr<OpenLogicalChannelResponse> openLogicalChannelResp,
|
||||
const HDI::Ril::V1_0::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
const HDI::Ril::V1_1::OpenLogicalChannelResponse &pOpenLogicalChannelResponse)
|
||||
{
|
||||
openLogicalChannelResp->sw1 = pOpenLogicalChannelResponse.sw1;
|
||||
openLogicalChannelResp->sw2 = pOpenLogicalChannelResponse.sw2;
|
||||
@ -516,7 +516,7 @@ void TelRilSim::BuildOpenLogicalChannelResp(std::shared_ptr<OpenLogicalChannelRe
|
||||
}
|
||||
|
||||
void TelRilSim::BuildApduRequestInfo(
|
||||
OHOS::HDI::Ril::V1_0::ApduSimIORequestInfo &ApduRequestInfo, const ApduSimIORequestInfo &reqInfo)
|
||||
OHOS::HDI::Ril::V1_1::ApduSimIORequestInfo &ApduRequestInfo, const ApduSimIORequestInfo &reqInfo)
|
||||
{
|
||||
ApduRequestInfo.channelId = reqInfo.channelId;
|
||||
ApduRequestInfo.type = reqInfo.type;
|
||||
@ -528,7 +528,7 @@ void TelRilSim::BuildApduRequestInfo(
|
||||
}
|
||||
|
||||
int32_t TelRilSim::ResponseIccIo(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::IccIoResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::IccIoResultInfo &result)
|
||||
{
|
||||
std::shared_ptr<IccIoResultInfo> iccIoResult = std::make_shared<IccIoResultInfo>();
|
||||
BuildIccIoResult(iccIoResult, result);
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
namespace OHOS {
|
||||
namespace Telephony {
|
||||
TelRilSms::TelRilSms(int32_t slotId, sptr<HDI::Ril::V1_0::IRil> rilInterface,
|
||||
TelRilSms::TelRilSms(int32_t slotId, sptr<HDI::Ril::V1_1::IRil> rilInterface,
|
||||
std::shared_ptr<ObserverHandler> observerHandler, std::shared_ptr<TelRilHandler> handler)
|
||||
: TelRilBase(slotId, rilInterface, observerHandler, handler)
|
||||
{}
|
||||
@ -42,18 +42,18 @@ bool TelRilSms::IsSmsRespOrNotify(uint32_t code)
|
||||
return IsSmsResponse(code) || IsSmsNotification(code);
|
||||
}
|
||||
|
||||
HDI::Ril::V1_0::GsmSmsMessageInfo TelRilSms::ConstructGsmSendSmsRequestLinkList(std::string &smsPdu, std::string &pdu)
|
||||
HDI::Ril::V1_1::GsmSmsMessageInfo TelRilSms::ConstructGsmSendSmsRequestLinkList(std::string &smsPdu, std::string &pdu)
|
||||
{
|
||||
HDI::Ril::V1_0::GsmSmsMessageInfo msg;
|
||||
HDI::Ril::V1_1::GsmSmsMessageInfo msg;
|
||||
msg.smscPdu = smsPdu.empty() ? "" : smsPdu;
|
||||
msg.pdu = pdu.empty() ? "" : pdu;
|
||||
return msg;
|
||||
}
|
||||
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo TelRilSms::ConstructSmsMessageIOInfoRequestLinkList(
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo TelRilSms::ConstructSmsMessageIOInfoRequestLinkList(
|
||||
std::string &smsPdu, std::string &pdu)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo msg;
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo msg;
|
||||
msg.smscPdu = smsPdu.empty() ? "" : smsPdu;
|
||||
msg.pdu = pdu.empty() ? "" : pdu;
|
||||
return msg;
|
||||
@ -61,137 +61,137 @@ OHOS::HDI::Ril::V1_0::SmsMessageIOInfo TelRilSms::ConstructSmsMessageIOInfoReque
|
||||
|
||||
int32_t TelRilSms::SendGsmSms(std::string &smsPdu, std::string &pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::GsmSmsMessageInfo gsmSmsMessageInfo = ConstructGsmSendSmsRequestLinkList(smsPdu, pdu);
|
||||
HDI::Ril::V1_1::GsmSmsMessageInfo gsmSmsMessageInfo = ConstructGsmSendSmsRequestLinkList(smsPdu, pdu);
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_GSM_SMS, &HDI::Ril::V1_0::IRil::SendGsmSms, gsmSmsMessageInfo);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_GSM_SMS, &HDI::Ril::V1_1::IRil::SendGsmSms, gsmSmsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendCdmaSms(std::string pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::SendCdmaSmsMessageInfo cdmaSmsMessageInfo = {};
|
||||
HDI::Ril::V1_1::SendCdmaSmsMessageInfo cdmaSmsMessageInfo = {};
|
||||
cdmaSmsMessageInfo.smscPdu = pdu;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_CDMA_SMS, &HDI::Ril::V1_0::IRil::SendCdmaSms,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_CDMA_SMS, &HDI::Ril::V1_1::IRil::SendCdmaSms,
|
||||
cdmaSmsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::AddSimMessage(
|
||||
int32_t status, std::string smscPdu, std::string pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo mGsmSmsMessageInfo = ConstructSmsMessageIOInfoRequestLinkList(smscPdu, pdu);
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo mGsmSmsMessageInfo = ConstructSmsMessageIOInfoRequestLinkList(smscPdu, pdu);
|
||||
mGsmSmsMessageInfo.state = status;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_ADD_SIM_MESSAGE, &HDI::Ril::V1_0::IRil::AddSimMessage,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_ADD_SIM_MESSAGE, &HDI::Ril::V1_1::IRil::AddSimMessage,
|
||||
mGsmSmsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::DelSimMessage(int32_t gsmIndex, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_DEL_SIM_MESSAGE, &HDI::Ril::V1_0::IRil::DelSimMessage, gsmIndex);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_DEL_SIM_MESSAGE, &HDI::Ril::V1_1::IRil::DelSimMessage, gsmIndex);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::UpdateSimMessage(int32_t gsmIndex, int32_t state, std::string smscPdu, std::string pdu,
|
||||
const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo smsMessageIOInfo = ConstructSmsMessageIOInfoRequestLinkList(smscPdu, pdu);
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo smsMessageIOInfo = ConstructSmsMessageIOInfoRequestLinkList(smscPdu, pdu);
|
||||
smsMessageIOInfo.index = gsmIndex;
|
||||
smsMessageIOInfo.state = state;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_UPDATE_SIM_MESSAGE,
|
||||
&HDI::Ril::V1_0::IRil::UpdateSimMessage, smsMessageIOInfo);
|
||||
&HDI::Ril::V1_1::IRil::UpdateSimMessage, smsMessageIOInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetSmscAddr(int32_t tosca, std::string address, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::ServiceCenterAddress serCenterAddress;
|
||||
OHOS::HDI::Ril::V1_1::ServiceCenterAddress serCenterAddress;
|
||||
serCenterAddress.address = address;
|
||||
serCenterAddress.tosca = tosca;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SET_SMSC_ADDR, &HDI::Ril::V1_0::IRil::SetSmscAddr,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SET_SMSC_ADDR, &HDI::Ril::V1_1::IRil::SetSmscAddr,
|
||||
serCenterAddress);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetSmscAddr(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_SMSC_ADDR, &HDI::Ril::V1_0::IRil::GetSmscAddr);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_SMSC_ADDR, &HDI::Ril::V1_1::IRil::GetSmscAddr);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetCdmaCBConfig(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_CDMA_CB_CONFIG, &HDI::Ril::V1_0::IRil::GetCdmaCBConfig);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_CDMA_CB_CONFIG, &HDI::Ril::V1_1::IRil::GetCdmaCBConfig);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendSmsMoreMode(
|
||||
std::string &smscPdu, std::string &pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::GsmSmsMessageInfo gsmSmsMessageInfo = ConstructGsmSendSmsRequestLinkList(smscPdu, pdu);
|
||||
HDI::Ril::V1_1::GsmSmsMessageInfo gsmSmsMessageInfo = ConstructGsmSendSmsRequestLinkList(smscPdu, pdu);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_SMS_MORE_MODE,
|
||||
&HDI::Ril::V1_0::IRil::SendSmsMoreMode, gsmSmsMessageInfo);
|
||||
&HDI::Ril::V1_1::IRil::SendSmsMoreMode, gsmSmsMessageInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendSmsAck(bool success, int32_t cause, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::ModeData mModeData;
|
||||
HDI::Ril::V1_1::ModeData mModeData;
|
||||
mModeData.result = success;
|
||||
mModeData.mode = cause;
|
||||
return Request(
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_SMS_ACK, &HDI::Ril::V1_0::IRil::SendSmsAck, mModeData);
|
||||
TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SEND_SMS_ACK, &HDI::Ril::V1_1::IRil::SendSmsAck, mModeData);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetCBConfig(
|
||||
int32_t mode, std::string idList, std::string dcsList, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::CBConfigInfo cellBroadcastInfo;
|
||||
HDI::Ril::V1_1::CBConfigInfo cellBroadcastInfo;
|
||||
cellBroadcastInfo.mode = mode;
|
||||
cellBroadcastInfo.mids = idList.empty() ? "" : idList;
|
||||
cellBroadcastInfo.dcss = dcsList.empty() ? "" : dcsList;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SET_CB_CONFIG, &HDI::Ril::V1_0::IRil::SetCBConfig,
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SET_CB_CONFIG, &HDI::Ril::V1_1::IRil::SetCBConfig,
|
||||
cellBroadcastInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetCdmaCBConfig(
|
||||
const CdmaCBConfigInfoList &cdmaCBConfigInfoList, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
HDI::Ril::V1_0::CdmaCBConfigInfoList iCdmaCBConfigInfoList;
|
||||
HDI::Ril::V1_1::CdmaCBConfigInfoList iCdmaCBConfigInfoList;
|
||||
iCdmaCBConfigInfoList.size = cdmaCBConfigInfoList.size;
|
||||
for (auto &cdmaCBConfigInfo : cdmaCBConfigInfoList.list) {
|
||||
HDI::Ril::V1_0::CdmaCBConfigInfo iCdmaCBConfigInfo = {};
|
||||
HDI::Ril::V1_1::CdmaCBConfigInfo iCdmaCBConfigInfo = {};
|
||||
iCdmaCBConfigInfo.service = cdmaCBConfigInfo.service;
|
||||
iCdmaCBConfigInfo.language = cdmaCBConfigInfo.language;
|
||||
iCdmaCBConfigInfo.checked = cdmaCBConfigInfo.checked;
|
||||
iCdmaCBConfigInfoList.list.push_back(iCdmaCBConfigInfo);
|
||||
}
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_SET_CDMA_CB_CONFIG,
|
||||
&HDI::Ril::V1_0::IRil::SetCdmaCBConfig, iCdmaCBConfigInfoList);
|
||||
&HDI::Ril::V1_1::IRil::SetCdmaCBConfig, iCdmaCBConfigInfoList);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetCBConfig(const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_CB_CONFIG, &HDI::Ril::V1_0::IRil::GetCBConfig);
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_GET_CB_CONFIG, &HDI::Ril::V1_1::IRil::GetCBConfig);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::AddCdmaSimMessage(int32_t status, std::string &pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo mSmsMessageIOInfo = {};
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo mSmsMessageIOInfo = {};
|
||||
mSmsMessageIOInfo.state = status;
|
||||
mSmsMessageIOInfo.pdu = pdu;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_ADD_CDMA_SIM_MESSAGE,
|
||||
&HDI::Ril::V1_0::IRil::AddCdmaSimMessage, mSmsMessageIOInfo);
|
||||
&HDI::Ril::V1_1::IRil::AddCdmaSimMessage, mSmsMessageIOInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::DelCdmaSimMessage(int32_t cdmaIndex, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_DEL_CDMA_SIM_MESSAGE,
|
||||
&HDI::Ril::V1_0::IRil::DelCdmaSimMessage, cdmaIndex);
|
||||
&HDI::Ril::V1_1::IRil::DelCdmaSimMessage, cdmaIndex);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::UpdateCdmaSimMessage(
|
||||
int32_t cdmaIndex, int32_t state, std::string pdu, const AppExecFwk::InnerEvent::Pointer &response)
|
||||
{
|
||||
OHOS::HDI::Ril::V1_0::SmsMessageIOInfo smsMessageIOInfo = {};
|
||||
OHOS::HDI::Ril::V1_1::SmsMessageIOInfo smsMessageIOInfo = {};
|
||||
smsMessageIOInfo.index = cdmaIndex;
|
||||
smsMessageIOInfo.state = state;
|
||||
smsMessageIOInfo.pdu = pdu;
|
||||
return Request(TELEPHONY_LOG_FUNC_NAME, response, HREQ_SMS_UPDATE_CDMA_SIM_MESSAGE,
|
||||
&HDI::Ril::V1_0::IRil::UpdateCdmaSimMessage, smsMessageIOInfo);
|
||||
&HDI::Ril::V1_1::IRil::UpdateCdmaSimMessage, smsMessageIOInfo);
|
||||
}
|
||||
|
||||
uint8_t TelRilSms::ConvertHexCharToInt(uint8_t ch)
|
||||
@ -238,7 +238,7 @@ uint8_t *TelRilSms::ConvertHexStringToBytes(const uint8_t *hexString, size_t len
|
||||
return bytes;
|
||||
}
|
||||
|
||||
int32_t TelRilSms::NewSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessageInfo)
|
||||
int32_t TelRilSms::NewSmsNotify(const HDI::Ril::V1_1::SmsMessageInfo &iSmsMessageInfo)
|
||||
{
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo = std::make_shared<SmsMessageInfo>();
|
||||
if (smsMessageInfo == nullptr) {
|
||||
@ -249,7 +249,7 @@ int32_t TelRilSms::NewSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessag
|
||||
return Notify<SmsMessageInfo>(TELEPHONY_LOG_FUNC_NAME, smsMessageInfo, RadioEvent::RADIO_GSM_SMS);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::NewCdmaSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessageInfo)
|
||||
int32_t TelRilSms::NewCdmaSmsNotify(const HDI::Ril::V1_1::SmsMessageInfo &iSmsMessageInfo)
|
||||
{
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo = std::make_shared<SmsMessageInfo>();
|
||||
if (smsMessageInfo == nullptr) {
|
||||
@ -263,7 +263,7 @@ int32_t TelRilSms::NewCdmaSmsNotify(const HDI::Ril::V1_0::SmsMessageInfo &iSmsMe
|
||||
return Notify<SmsMessageInfo>(TELEPHONY_LOG_FUNC_NAME, smsMessageInfo, RadioEvent::RADIO_CDMA_SMS);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SmsStatusReportNotify(const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessageInfo)
|
||||
int32_t TelRilSms::SmsStatusReportNotify(const HDI::Ril::V1_1::SmsMessageInfo &iSmsMessageInfo)
|
||||
{
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo = std::make_shared<SmsMessageInfo>();
|
||||
if (smsMessageInfo == nullptr) {
|
||||
@ -281,7 +281,7 @@ int32_t TelRilSms::NewSmsStoredOnSimNotify(int32_t recordNumber, int32_t indicat
|
||||
TELEPHONY_LOG_FUNC_NAME, std::make_shared<int32_t>(recordNumber), RadioEvent::RADIO_SMS_ON_SIM);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::CBConfigNotify(const HDI::Ril::V1_0::CBConfigReportInfo &iCellBroadConfigReportInfo)
|
||||
int32_t TelRilSms::CBConfigNotify(const HDI::Ril::V1_1::CBConfigReportInfo &iCellBroadConfigReportInfo)
|
||||
{
|
||||
std::shared_ptr<CBConfigReportInfo> cellBroadConfigReportInfo = std::make_shared<CBConfigReportInfo>();
|
||||
if (cellBroadConfigReportInfo == nullptr) {
|
||||
@ -293,40 +293,40 @@ int32_t TelRilSms::CBConfigNotify(const HDI::Ril::V1_0::CBConfigReportInfo &iCel
|
||||
TELEPHONY_LOG_FUNC_NAME, cellBroadConfigReportInfo, RadioEvent::RADIO_CELL_BROADCAST);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendGsmSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
int32_t TelRilSms::SendGsmSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
{
|
||||
return ResponseSendSms(responseInfo, iSendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendCdmaSmsResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
int32_t TelRilSms::SendCdmaSmsResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
{
|
||||
return ResponseSendSms(responseInfo, iSendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::AddSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::AddSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::DelSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::DelSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::UpdateSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::UpdateSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::SetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &iServiceCenterAddress)
|
||||
int32_t TelRilSms::GetSmscAddrResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &iServiceCenterAddress)
|
||||
{
|
||||
std::shared_ptr<ServiceCenterAddress> serCenterAddress = std::make_shared<ServiceCenterAddress>();
|
||||
if (serCenterAddress == nullptr) {
|
||||
@ -338,7 +338,7 @@ int32_t TelRilSms::GetSmscAddrResponse(const HDI::Ril::V1_0::RilRadioResponseInf
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetCBConfigResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CBConfigInfo &iCellBroadcastInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CBConfigInfo &iCellBroadcastInfo)
|
||||
{
|
||||
std::shared_ptr<CBConfigInfo> cellBroadcastInfo = std::make_shared<CBConfigInfo>();
|
||||
if (cellBroadcastInfo == nullptr) {
|
||||
@ -350,7 +350,7 @@ int32_t TelRilSms::GetCBConfigResponse(
|
||||
}
|
||||
|
||||
int32_t TelRilSms::GetCdmaCBConfigResponse(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::CdmaCBConfigInfo &iCdmaCBConfigInfo)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::CdmaCBConfigInfo &iCdmaCBConfigInfo)
|
||||
{
|
||||
std::shared_ptr<CdmaCBConfigInfo> cdmaCBConfigInfo = std::make_shared<CdmaCBConfigInfo>();
|
||||
if (cdmaCBConfigInfo == nullptr) {
|
||||
@ -361,44 +361,44 @@ int32_t TelRilSms::GetCdmaCBConfigResponse(
|
||||
return Response<CdmaCBConfigInfo>(TELEPHONY_LOG_FUNC_NAME, responseInfo, cdmaCBConfigInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendSmsMoreModeResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
int32_t TelRilSms::SendSmsMoreModeResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
|
||||
const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
{
|
||||
return ResponseSendSms(responseInfo, iSendSmsResultInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SendSmsAckResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::SendSmsAckResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::SetCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::SetCdmaCBConfigResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::SetCdmaCBConfigResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::AddCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::AddCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::DelCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::DelCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
int32_t TelRilSms::UpdateCdmaSimMessageResponse(const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo)
|
||||
int32_t TelRilSms::UpdateCdmaSimMessageResponse(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
|
||||
{
|
||||
return Response(TELEPHONY_LOG_FUNC_NAME, responseInfo);
|
||||
}
|
||||
|
||||
void TelRilSms::BuildSendSmsResultInfo(
|
||||
std::shared_ptr<SendSmsResultInfo> sendSmsResultInfo, const HDI::Ril::V1_0::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
std::shared_ptr<SendSmsResultInfo> sendSmsResultInfo, const HDI::Ril::V1_1::SendSmsResultInfo &iSendSmsResultInfo)
|
||||
{
|
||||
sendSmsResultInfo->msgRef = iSendSmsResultInfo.msgRef;
|
||||
sendSmsResultInfo->pdu = iSendSmsResultInfo.pdu;
|
||||
@ -406,7 +406,7 @@ void TelRilSms::BuildSendSmsResultInfo(
|
||||
}
|
||||
|
||||
void TelRilSms::BuildCBConfigInfo(
|
||||
std::shared_ptr<CBConfigInfo> cellBroadcastInfo, const HDI::Ril::V1_0::CBConfigInfo &iCellBroadcastInfo)
|
||||
std::shared_ptr<CBConfigInfo> cellBroadcastInfo, const HDI::Ril::V1_1::CBConfigInfo &iCellBroadcastInfo)
|
||||
{
|
||||
cellBroadcastInfo->serial = iCellBroadcastInfo.serial;
|
||||
cellBroadcastInfo->mode = iCellBroadcastInfo.mode;
|
||||
@ -416,7 +416,7 @@ void TelRilSms::BuildCBConfigInfo(
|
||||
}
|
||||
|
||||
void TelRilSms::BuildServiceCenterAddress(std::shared_ptr<ServiceCenterAddress> serCenterAddress,
|
||||
const HDI::Ril::V1_0::ServiceCenterAddress &iServiceCenterAddress)
|
||||
const HDI::Ril::V1_1::ServiceCenterAddress &iServiceCenterAddress)
|
||||
{
|
||||
serCenterAddress->serial = iServiceCenterAddress.serial;
|
||||
serCenterAddress->tosca = iServiceCenterAddress.tosca;
|
||||
@ -424,7 +424,7 @@ void TelRilSms::BuildServiceCenterAddress(std::shared_ptr<ServiceCenterAddress>
|
||||
}
|
||||
|
||||
void TelRilSms::BuildCdmaCBConfigInfo(
|
||||
std::shared_ptr<CdmaCBConfigInfo> cdmaCBConfigInfo, const HDI::Ril::V1_0::CdmaCBConfigInfo &iCdmaCBConfigInfo)
|
||||
std::shared_ptr<CdmaCBConfigInfo> cdmaCBConfigInfo, const HDI::Ril::V1_1::CdmaCBConfigInfo &iCdmaCBConfigInfo)
|
||||
{
|
||||
cdmaCBConfigInfo->service = iCdmaCBConfigInfo.service;
|
||||
cdmaCBConfigInfo->language = iCdmaCBConfigInfo.language;
|
||||
@ -432,7 +432,7 @@ void TelRilSms::BuildCdmaCBConfigInfo(
|
||||
}
|
||||
|
||||
void TelRilSms::BuildSmsMessageInfo(
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo, const HDI::Ril::V1_0::SmsMessageInfo &iSmsMessageInfo)
|
||||
std::shared_ptr<SmsMessageInfo> smsMessageInfo, const HDI::Ril::V1_1::SmsMessageInfo &iSmsMessageInfo)
|
||||
{
|
||||
smsMessageInfo->indicationType = iSmsMessageInfo.indicationType;
|
||||
smsMessageInfo->size = iSmsMessageInfo.size;
|
||||
@ -441,7 +441,7 @@ void TelRilSms::BuildSmsMessageInfo(
|
||||
}
|
||||
}
|
||||
void TelRilSms::BuildCBConfigReportInfo(std::shared_ptr<CBConfigReportInfo> cellBroadConfigReportInfo,
|
||||
const HDI::Ril::V1_0::CBConfigReportInfo &iCellBroadConfigReportInfo)
|
||||
const HDI::Ril::V1_1::CBConfigReportInfo &iCellBroadConfigReportInfo)
|
||||
{
|
||||
cellBroadConfigReportInfo->indicationType = iCellBroadConfigReportInfo.indicationType;
|
||||
cellBroadConfigReportInfo->sn = iCellBroadConfigReportInfo.sn;
|
||||
@ -455,7 +455,7 @@ void TelRilSms::BuildCBConfigReportInfo(std::shared_ptr<CBConfigReportInfo> cell
|
||||
}
|
||||
|
||||
int32_t TelRilSms::ResponseSendSms(
|
||||
const HDI::Ril::V1_0::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_0::SendSmsResultInfo &result)
|
||||
const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const HDI::Ril::V1_1::SendSmsResultInfo &result)
|
||||
{
|
||||
auto getDataFunc = [&result, this](std::shared_ptr<TelRilRequest> telRilRequest) {
|
||||
std::shared_ptr<SendSmsResultInfo> sendSmsResultInfo = std::make_shared<SendSmsResultInfo>();
|
||||
|
||||
@ -53,7 +53,7 @@ void SendSmsMoreMode(const uint8_t *data, size_t size)
|
||||
std::string dcsList(reinterpret_cast<const char *>(data), size);
|
||||
std::unique_ptr<uint8_t> object = std::make_unique<uint8_t>(*data);
|
||||
AppExecFwk::InnerEvent::Pointer response = AppExecFwk::InnerEvent::Get(responseId, object);
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
@ -95,7 +95,7 @@ void GetCallList(const uint8_t *data, size_t size)
|
||||
std::string newPassword(reinterpret_cast<const char *>(data), size);
|
||||
std::unique_ptr<uint8_t> object = std::make_unique<uint8_t>(*data);
|
||||
AppExecFwk::InnerEvent::Pointer result = AppExecFwk::InnerEvent::Get(resultId, object);
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
@ -134,9 +134,9 @@ void AnswerResponse(const uint8_t *data, size_t size)
|
||||
int32_t resultId = static_cast<int32_t>(size);
|
||||
std::unique_ptr<uint8_t> object = std::make_unique<uint8_t>(*data);
|
||||
AppExecFwk::InnerEvent::Pointer result = AppExecFwk::InnerEvent::Get(resultId, object);
|
||||
HDI::Ril::V1_0::RilRadioResponseInfo responseInfo;
|
||||
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
|
||||
responseInfo.slotId = slotId;
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
@ -171,7 +171,7 @@ void DeactivatePdpContext(const uint8_t *data, size_t size)
|
||||
std::string userName(reinterpret_cast<const char *>(data), size);
|
||||
std::string password(reinterpret_cast<const char *>(data), size);
|
||||
std::string roamingProtocol(reinterpret_cast<const char *>(data), size);
|
||||
HDI::Ril::V1_0::RilRadioResponseInfo responseInfo;
|
||||
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
|
||||
responseInfo.slotId = slotId;
|
||||
std::unique_ptr<uint8_t> object = std::make_unique<uint8_t>(*data);
|
||||
AppExecFwk::InnerEvent::Pointer response = AppExecFwk::InnerEvent::Get(responseId, object);
|
||||
@ -183,7 +183,7 @@ void DeactivatePdpContext(const uint8_t *data, size_t size)
|
||||
dataProfile.userName = userName;
|
||||
dataProfile.password = password;
|
||||
dataProfile.roamingProtocol = roamingProtocol;
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
@ -206,9 +206,9 @@ void SimStkProactiveNotify(const uint8_t *data, size_t size)
|
||||
{
|
||||
int32_t slotId = static_cast<int32_t>(size % SLOT_NUM);
|
||||
std::string response(reinterpret_cast<const char *>(data), size);
|
||||
HDI::Ril::V1_0::RilRadioResponseInfo responseInfo;
|
||||
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
|
||||
responseInfo.slotId = slotId;
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
@ -255,7 +255,7 @@ void GetSimStatus(const uint8_t *data, size_t size)
|
||||
simIoInfo.aid = aid;
|
||||
std::unique_ptr<uint8_t> object = std::make_unique<uint8_t>(*data);
|
||||
AppExecFwk::InnerEvent::Pointer result = AppExecFwk::InnerEvent::Get(resultId, object);
|
||||
auto rilInterface_ = HDI::Ril::V1_0::IRil::Get();
|
||||
auto rilInterface_ = HDI::Ril::V1_1::IRil::Get();
|
||||
std::shared_ptr<ObserverHandler> observerHandler = std::make_shared<ObserverHandler>();
|
||||
auto eventLoop_ = AppExecFwk::EventRunner::Create("TelRilEventLoop");
|
||||
if (eventLoop_ == nullptr) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user