types.h修改

Signed-off-by: ASheLock <zhoujie223@huawei.com>
This commit is contained in:
ASheLock 2024-04-02 15:15:00 +08:00
parent 00cce46a35
commit a3866b0190
17 changed files with 314 additions and 529 deletions

View File

@ -22,68 +22,6 @@
namespace OHOS {
namespace Telephony {
enum class HRilErrType : int32_t {
/** No error */
NONE = 0,
/** An error that not included in bellow items */
HRIL_ERR_GENERIC_FAILURE,
/** Invalid parameter */
HRIL_ERR_INVALID_PARAMETER,
/** Full memory */
HRIL_ERR_MEMORY_FULL,
/** Send command failed */
HRIL_ERR_CMD_SEND_FAILURE,
/** NO CARRIER response returned */
HRIL_ERR_CMD_NO_CARRIER,
/** The response is invalid */
HRIL_ERR_INVALID_RESPONSE,
/** The new status of radio to set is same with previous */
HRIL_ERR_REPEAT_STATUS,
/** Network search error */
HRIL_ERR_NETWORK_SEARCHING,
/** Network search interrupted */
HRIL_ERR_NETWORK_SEARCHING_INTERRUPTED,
/** The AT channel is closed */
HRIL_ERR_MODEM_DEVICE_CLOSE,
/** No sim card error */
HRIL_ERR_NO_SIMCARD_INSERTED,
/** Need pin code */
HRIL_ERR_NEED_PIN_CODE,
/** Need puk code */
HRIL_ERR_NEED_PUK_CODE,
/** Network search timeout */
HRIL_ERR_NETWORK_SEARCH_TIMEOUT,
/** Pin or puk password is not correct */
HRIL_ERR_PINPUK_PASSWORD_NOCORRECT,
/** Invalid modem parameter */
HRIL_ERR_INVALID_MODEM_PARAMETER = 50,
/** IPC failure */
HRIL_ERR_HDF_IPC_FAILURE = 300,
/** Null point error */
HRIL_ERR_NULL_POINT,
/** Vendor not implement error. */
HRIL_ERR_VENDOR_NOT_IMPLEMENT
};
enum class HRilNotiType { HRIL_NOTIFICATION, HRIL_NO_DEFINE };
/**
@ -131,138 +69,6 @@ enum class HRilApnTypes : int32_t {
*/
enum HRilRunningLockTypes { UNNEED_LOCK, NEED_LOCK };
/**
* @brief Indicates the hril response type.
*/
enum HRilResponseTypes {
HRIL_RESPONSE_REQUEST,
HRIL_RESPONSE_NOTICE,
HRIL_RESPONSE_REQUEST_ACK,
HRIL_RESPONSE_REQUEST_MUST_ACK,
HRIL_RESPONSE_NOTICE_MUST_ACK,
};
/**
* @brief From 3GPP TS 27.007 V4.3.0 (2001-12) 8.5, AT + CSQ.
*/
struct GsmRssi {
/**
* Received Signal Strength Indication, value range 0 ~ 31, max is 99,
* if unknown then set to max
*/
int32_t rxlev = 0;
/**
* Bit error rate, value range 0 ~ 7, max is 99, if unknown then set to
* max as RXQUAL values in the table in TS 45.008 [20] subclauses 8.2.4.
*/
int32_t ber = 0;
};
/**
* @brief From 3GPP TS 27.007 V17.1.0 (2021-03) 8.69.
*/
struct CdmaRssi {
/**
* Absolute value of signal strength. This value is the actual Rssi value
* multiplied by -1. e.g: Rssi is -75, then this response value will be 75.
*/
int32_t absoluteRssi = 0;
/**
* integer type, ratio of the received energy per PN chip to the total
* received power spectral density (see 3GPP TS 25.133 [95] subclauses)
*/
int32_t ecno = 0;
};
/**
* @brief Indicates some parameters which can reflect the strength of WCDMA signal.
*/
struct WCdmaRssi {
/**
* integer type, received signal strength level (see 3GPP TS 45.008 [20]
* sub-clause 8.1.4) value 0~99.
*/
int32_t rxlev = 0;
/**
* integer type, ratio of the received energy per PN chip to the total
* received power spectral density (see 3GPP TS 25.133 [95] sub-clause).
*/
int32_t ecio = 0;
/**
* integer type, received signal code power (see 3GPP TS 25.133 [95]
* sub-clause 9.1.1.3 and 3GPP TS 25.123 [96] sub-clause 9.1.1.1.3).
* range value 0 ~ 96, 255 not known or not detectable.
*/
int32_t rscp = 0;
/**
* Bit error rate, value range 0 ~ 7, max is 99, if unknown then set to
* max
*/
int32_t ber = 0;
};
/**
* @brief Indicates some parameters which can reflect the strength of LTE signal.
*/
struct LteRssi {
/**
* integer type, received signal strength level
* (see 3GPP TS 45.008 [20] sub-clause 8.1.4) value 0~99.
*/
int32_t rxlev = 0;
/**
* integer type, reference signal received quality (see 3GPP TS 36.133 [96] sub-clause 9.1.7)
* value range 0~33, 255 not known or not detectable.
*/
int32_t rsrq = 0;
/**
* integer type, reference signal received power (see 3GPP TS 36.133 [96] sub-clause 9.1.4)
* value range 0~97, 255 not known or not detectable.
*/
int32_t rsrp = 0;
/**
* integer type, representing the signal-to-interference plus noise ratio, suitable for LTE mode
* value range 0~251, 255 not known or not detectable.
*/
int32_t snr = 0;
};
/**
* @brief Indicates some parameters which can reflect the strength of TD-SCDMA signal.
*/
struct TdScdmaRssi {
int32_t rscp = 0;
};
/**
* @brief Indicates some parameters which can reflect the strength of NR signal.
*/
struct NrRssi {
int32_t rsrp = 0;
int32_t rsrq = 0;
int32_t sinr = 0;
};
/**
* @brief Indicates signal level of some RATs.
*/
struct Rssi {
GsmRssi gw;
CdmaRssi cdma;
WCdmaRssi wcdma;
LteRssi lte;
TdScdmaRssi tdScdma;
NrRssi nr;
};
/**
* @brief From 3GPP TS 27.007 V4.3.0 (2001-12).
*/
@ -274,27 +80,6 @@ struct GetCallWaitingInfo {
int32_t typeClass = 0;
};
struct HRilResponseHeadInfo {
int32_t slotId = 0;
HRilResponseTypes type = HRilResponseTypes::HRIL_RESPONSE_REQUEST;
};
/**
* @brief Indicates the response information, for example whether the
* request is success, serial number, response type etc.
*/
struct HRilRadioResponseInfo {
int32_t flag = -1;
int32_t serial = -1;
HRilErrType error = HRilErrType::NONE;
HRilResponseTypes type = HRilResponseTypes::HRIL_RESPONSE_REQUEST;
};
struct HRilRadioStateInfo {
int64_t flag = 0;
int32_t state = 0;
};
enum HRilCommonNumber {
HRIL_DEC = 10,
HRIL_INVALID_HEX_CHAR = 16,

View File

@ -41,7 +41,7 @@ public:
// The "reply" event processing entry.
template<typename T>
int32_t ProcessResponse(
int32_t code, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t code, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
// The "Active reporting" event processing entry.
template<typename T>
int32_t ProcessNotify(
@ -57,7 +57,7 @@ protected:
uint8_t *ConvertHexStringToBytes(const void *response, size_t responseLen);
bool ConvertToString(char **dest, const std::string &src);
void CopyToCharPoint(char **a, const std::string &temp);
HDI::Ril::V1_1::RilRadioResponseInfo BuildIHRilRadioResponseInfo(const HRilRadioResponseInfo &responseInfo);
HDI::Ril::V1_1::RilRadioResponseInfo BuildIHRilRadioResponseInfo(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo);
inline void SafeFrees() {}
template<typename M, typename... Ms>
inline void SafeFrees(M &m, Ms &...ms)
@ -70,7 +70,7 @@ protected:
}
template<typename FuncType, typename... ParamTypes>
inline int32_t Response(HRilRadioResponseInfo &responseInfo, FuncType &&_func, ParamTypes &&... _args);
inline int32_t Response(HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, FuncType &&_func, ParamTypes &&... _args);
template<typename FuncType, typename... ParamTypes>
inline int32_t Notify(int32_t notifyType, const HRilErrNumber error, FuncType &&_func, ParamTypes &&... _args);
int32_t ConvertHexStringToInt(char **response, int32_t index, int32_t length);
@ -144,10 +144,10 @@ F HRilBase::GetFunc(std::map<uint32_t, std::any> &funcs, uint32_t code)
template<typename T>
int32_t HRilBase::ProcessResponse(
int32_t code, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t code, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
using RespFunc = int32_t (T::*)(
int32_t requestNum, HRilRadioResponseInfo & responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo & responseInfo, const void *response, size_t responseLen);
auto func = GetFunc<RespFunc>(respMemberFuncMap_, code);
if (func != nullptr) {
return (static_cast<T *>(this)->*func)(code, responseInfo, response, responseLen);
@ -173,7 +173,7 @@ int32_t HRilBase::ProcessNotify(
}
template<typename FuncType, typename... ParamTypes>
inline int32_t HRilBase::Response(HRilRadioResponseInfo &responseInfo, FuncType &&_func, ParamTypes &&... _args)
inline int32_t HRilBase::Response(HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, FuncType &&_func, ParamTypes &&... _args)
{
if (callback_ == nullptr || _func == nullptr) {
TELEPHONY_LOGE("callback_ or _func is null");

View File

@ -69,79 +69,79 @@ public:
int32_t SetVonrSwitch(int32_t serialId, int32_t status);
int32_t GetCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t DialResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t HangupResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t RejectResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t HoldCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnHoldCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SwitchCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetLastCallErrorCodeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t AnswerResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetClipResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetClipResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t CombineConferenceResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SeparateConferenceResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t CallSupplementResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCallWaitingResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCallWaitingResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCallTransferInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCallTransferInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCallRestrictionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCallRestrictionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetClirResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetClirResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t StartDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SendDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t StopDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCallPreferenceModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCallPreferenceModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetMuteResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetMuteResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetEmergencyCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCallFailReasonResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetEmergencyCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetBarringPasswordResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t CloseUnFinishedUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetVonrSwitchResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t CallStateUpdated(int32_t notifyType, HRilErrNumber error, const void *response, size_t responseLen);
int32_t CallUssdNotice(int32_t notifyType, HRilErrNumber error, const void *response, size_t responseLen);
@ -155,7 +155,7 @@ public:
void BuildIEmergencyCallList(
HDI::Ril::V1_1::EmergencyInfoList &emergencyCallInfoList, const void *response, size_t responseLen);
void BuildICallForwardQueryInfoList(HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList,
HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
private:
void CopyToHRilEmergencyInfoArray(

View File

@ -33,40 +33,40 @@ public:
int32_t serialId, const OHOS::HDI::Ril::V1_1::DataPerformanceInfo &dataPerformanceInfo);
int32_t SendDataSleepMode(int32_t serialId, const OHOS::HDI::Ril::V1_1::DataSleepInfo &dataSleepInfo);
int32_t ActivatePdpContextResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t DeactivatePdpContextResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetPdpContextListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetInitApnInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t PdpContextListUpdated(
int32_t notifyType, const HRilErrNumber error, const void *response, size_t responseLen);
int32_t DataLinkCapabilityUpdated(
int32_t notifyType, const HRilErrNumber error, const void *response, size_t responseLen);
int32_t ProcessDataResponse(
int32_t code, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t code, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t ProcessDataRequest(int32_t code, struct HdfSBuf *data);
int32_t ProcessDataNotify(const struct ReportInfo *reportInfo, const void *response, size_t responseLen);
int32_t GetLinkCapability(int32_t serialId);
int32_t GetLinkCapabilityResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetLinkBandwidthInfo(int32_t serialId, int32_t cid);
int32_t GetLinkBandwidthInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetLinkBandwidthReportingRule(
int32_t serialId, const OHOS::HDI::Ril::V1_1::DataLinkBandwidthReportingRule &linkBandwidthRule);
int32_t SetLinkBandwidthReportingRuleResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetDataProfileInfo(int32_t serialId, const OHOS::HDI::Ril::V1_1::DataProfilesInfo &dataProfilesInfo);
int32_t SetDataProfileInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetDataPermitted(int32_t serialId, int32_t dataPermitted);
int32_t SetDataPermittedResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t CleanAllConnections(int32_t serialId);
int32_t CleanAllConnectionsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
bool IsDataRespOrNotify(uint32_t code);
bool IsDataResponse(uint32_t code);

View File

@ -33,19 +33,19 @@ public:
int32_t GetVoiceRadioTechnology(int32_t serialId);
int32_t GetBasebandVersion(int32_t serialId);
int32_t ShutDownResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetRadioStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetRadioStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetImeiResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetMeidResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetVoiceRadioTechnologyResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetBasebandVersionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t RadioStateUpdated(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);
int32_t VoiceRadioTechUpdated(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);
int32_t DsdsModeUpdated(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);

View File

@ -46,49 +46,49 @@ public:
int32_t GetNrSsbId(int32_t serialId);
int32_t GetSignalStrengthResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCsRegStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetPsRegStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetOperatorInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNetworkSearchInformationResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNetworkSelectionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetNetworkSelectionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetPreferredNetworkResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetPreferredNetworkResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNeighboringCellInfoListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNeighboringCellInfoListResponse_1_2(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCurrentCellInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCurrentCellInfoResponse_1_1(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCurrentCellInfoResponse_1_2(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetPhysicalChannelConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetLocateUpdatesResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetNotificationFilterResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetDeviceStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetNrOptionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNrOptionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetRrcConnectionStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetNrSsbIdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t NetworkCsRegStatusUpdated(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);
int32_t NetworkPsRegStatusUpdated(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);

View File

@ -27,7 +27,7 @@ public:
void ProcessSimRequest(int32_t code, struct HdfSBuf *data);
void ProcessSimResponse(
int32_t code, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t code, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
void ProcessSimNotify(const struct ReportInfo *reportInfo, const void *response, size_t responseLen);
bool IsSimRespOrNotify(uint32_t code);
void RegisterSimFuncs(const HRilSimReq *simFuncs);
@ -62,55 +62,55 @@ private:
void AddHandlerToMap();
void AddNotificationHandlerToMap();
int32_t GetSimIOResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetSimStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetImsiResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetSimLockStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetSimLockResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t ChangeSimPasswordResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnlockPinResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnlockPukResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnlockPin2Response(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnlockPuk2Response(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetActiveSimResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimStkSendTerminalResponseResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimStkSendEnvelopeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimStkSendCallSetupRequestResultResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimStkIsReadyResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetRadioProtocolResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetRadioProtocolResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimOpenLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimCloseLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimTransmitApduLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimTransmitApduBasicChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimAuthenticationResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UnlockSimLockResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
HDI::Ril::V1_1::IccIoResultInfo ProcessIccIoResponse(
HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SendSimMatchedOperatorInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SimStateUpdated(int32_t notifyType, const HRilErrNumber error, const void *response, size_t responseLen);
int32_t SimStkSessionEndNotify(
@ -140,9 +140,9 @@ private:
void CopyToHRilNcfgOperatorInfo(std::unique_ptr<HRilNcfgOperatorInfo> &rilNcfgOperatorInfo,
const OHOS::HDI::Ril::V1_2::NcfgOperatorInfo &ncfgOperatorInfo);
bool BuildLockStatusResp(const void *response, size_t responseLen, HDI::Ril::V1_1::LockStatusResp &lockStatus);
void ResponseLockStatus(HDI::Ril::V1_1::LockStatusResp &lockStatus, HRilRadioResponseInfo &responseInfo,
void ResponseLockStatus(HDI::Ril::V1_1::LockStatusResp &lockStatus, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
const void *response, size_t responseLen);
int32_t BuildSimIOResp(HDI::Ril::V1_1::IccIoResultInfo &result, HRilRadioResponseInfo &responseInfo,
int32_t BuildSimIOResp(HDI::Ril::V1_1::IccIoResultInfo &result, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
const void *response, size_t responseLen);
int32_t CheckCharData(const void *response, size_t responseLen);
void BuildRadioProtocol(HDI::Ril::V1_1::RadioProtocol &radioProtocol, const void *response);

View File

@ -46,37 +46,37 @@ public:
int32_t UpdateCdmaSimMessage(int32_t serialId, const OHOS::HDI::Ril::V1_1::SmsMessageIOInfo &smsMessageIOInfo);
int32_t SendGsmSmsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SendCdmaSmsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t AddSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t DelSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UpdateSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetSmscAddrResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetSmscAddrResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SetCdmaCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t GetCdmaCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SendSmsMoreModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SendSmsAckResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t AddCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t DelCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t UpdateCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen);
int32_t SmsStatusReportNotify(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);
int32_t NewSmsStoredOnSimNotify(int32_t indType, HRilErrNumber error, const void *response, size_t responseLen);
@ -92,7 +92,7 @@ private:
int32_t RequestWithStrings(int32_t serial, int32_t request, int32_t count, ...);
HDI::Ril::V1_1::CBConfigReportInfo MakeCBConfigResult(const void *response, const size_t responseLen);
HDI::Ril::V1_1::SendSmsResultInfo MakeSendSmsResult(
HRilRadioResponseInfo &responseInfo, int32_t serial, const void *response, const size_t responseLen);
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t serial, const void *response, const size_t responseLen);
void CopyToHRilCdmaCBConfigInfo(
HRilCdmaCBConfigInfo *list, OHOS::HDI::Ril::V1_1::CdmaCBConfigInfoList cellBroadcastInfoList);
bool CreateCdmaMessageInfo(HRilCdmaSmsMessageInfo &cdmaSmsInfo, const std::string &pdu);

View File

@ -146,7 +146,7 @@ ReqDataInfo *HRilBase::CreateHRilRequest(int32_t serial, int32_t request)
return HRilManager::manager_->CreateHRilRequest(serial, slotId_, request);
}
HDI::Ril::V1_1::RilRadioResponseInfo HRilBase::BuildIHRilRadioResponseInfo(const HRilRadioResponseInfo &responseInfo)
HDI::Ril::V1_1::RilRadioResponseInfo HRilBase::BuildIHRilRadioResponseInfo(const HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo)
{
HDI::Ril::V1_1::RilRadioResponseInfo iResponseInfo = { 0 };
iResponseInfo.slotId = GetSlotId();

View File

@ -342,7 +342,7 @@ void HRilCall::BuildICallList(
}
int32_t HRilCall::GetCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilCallInfo)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -356,37 +356,37 @@ int32_t HRilCall::GetCallListResponse(
}
int32_t HRilCall::DialResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::DialResponse);
}
int32_t HRilCall::HangupResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::HangupResponse);
}
int32_t HRilCall::RejectResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::RejectResponse);
}
int32_t HRilCall::AnswerResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::AnswerResponse);
}
int32_t HRilCall::HoldCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::HoldCallResponse);
}
int32_t HRilCall::GetClipResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilGetClipResult)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -403,43 +403,43 @@ int32_t HRilCall::GetClipResponse(
}
int32_t HRilCall::SetClipResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetClipResponse);
}
int32_t HRilCall::UnHoldCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::UnHoldCallResponse);
}
int32_t HRilCall::SwitchCallResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SwitchCallResponse);
}
int32_t HRilCall::CombineConferenceResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::CombineConferenceResponse);
}
int32_t HRilCall::SeparateConferenceResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SeparateConferenceResponse);
}
int32_t HRilCall::CallSupplementResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::CallSupplementResponse);
}
int32_t HRilCall::GetCallWaitingResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilCallWaitResult)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -456,13 +456,13 @@ int32_t HRilCall::GetCallWaitingResponse(
}
int32_t HRilCall::SetCallWaitingResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCallWaitingResponse);
}
int32_t HRilCall::GetCallTransferInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilCFQueryInfo)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -476,7 +476,7 @@ int32_t HRilCall::GetCallTransferInfoResponse(
}
void HRilCall::BuildICallForwardQueryInfoList(HDI::Ril::V1_1::CallForwardQueryInfoList &cFQueryList,
HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
size_t num = responseLen / sizeof(HRilCFQueryInfo);
HDI::Ril::V1_1::CallForwardQueryResult cFQueryResult;
@ -501,13 +501,13 @@ void HRilCall::BuildICallForwardQueryInfoList(HDI::Ril::V1_1::CallForwardQueryIn
}
int32_t HRilCall::SetCallTransferInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCallTransferInfoResponse);
}
int32_t HRilCall::GetClirResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilGetCallClirResult)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -524,13 +524,13 @@ int32_t HRilCall::GetClirResponse(
}
int32_t HRilCall::SetClirResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetClirResponse);
}
int32_t HRilCall::GetCallRestrictionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilCallRestrictionResult)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -547,37 +547,37 @@ int32_t HRilCall::GetCallRestrictionResponse(
}
int32_t HRilCall::SetCallRestrictionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCallRestrictionResponse);
}
int32_t HRilCall::SetBarringPasswordResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetBarringPasswordResponse);
}
int32_t HRilCall::StartDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::StartDtmfResponse);
}
int32_t HRilCall::SendDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SendDtmfResponse);
}
int32_t HRilCall::StopDtmfResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::StopDtmfResponse);
}
int32_t HRilCall::GetCallPreferenceModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(int32_t)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -591,19 +591,19 @@ int32_t HRilCall::GetCallPreferenceModeResponse(
}
int32_t HRilCall::SetCallPreferenceModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCallPreferenceModeResponse);
}
int32_t HRilCall::SetUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetUssdResponse);
}
int32_t HRilCall::GetMuteResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(int32_t)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -617,13 +617,13 @@ int32_t HRilCall::GetMuteResponse(
}
int32_t HRilCall::SetMuteResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetMuteResponse);
}
int32_t HRilCall::GetUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(int32_t)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -637,7 +637,7 @@ int32_t HRilCall::GetUssdResponse(
}
int32_t HRilCall::GetCallFailReasonResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(int32_t)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -675,7 +675,7 @@ void HRilCall::BuildIEmergencyCallList(
}
int32_t HRilCall::GetEmergencyCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilEmergencyInfo)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -726,19 +726,19 @@ void HRilCall::CopyToHRilEmergencyInfoArray(
}
int32_t HRilCall::SetEmergencyCallListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetEmergencyCallListResponse);
}
int32_t HRilCall::CloseUnFinishedUssdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::CloseUnFinishedUssdResponse);
}
int32_t HRilCall::SetVonrSwitchResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetVonrSwitchResponse);
}

View File

@ -238,19 +238,19 @@ int32_t HRilData::CleanAllConnections(int32_t serialId)
}
int32_t HRilData::CleanAllConnectionsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_2::IRilCallback::CleanAllConnectionsResponse);
}
int32_t HRilData::DeactivatePdpContextResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::DeactivatePdpContextResponse);
}
int32_t HRilData::ActivatePdpContextResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilDataCallResponse)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -266,7 +266,7 @@ int32_t HRilData::ActivatePdpContextResponse(
}
int32_t HRilData::GetPdpContextListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilDataCallResponse)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -281,19 +281,19 @@ int32_t HRilData::GetPdpContextListResponse(
}
int32_t HRilData::SetInitApnInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetInitApnInfoResponse);
}
int32_t HRilData::SetDataProfileInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return HRIL_ERR_SUCCESS;
}
int32_t HRilData::SetLinkBandwidthReportingRuleResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetLinkBandwidthReportingRuleResponse);
}
@ -328,7 +328,7 @@ int32_t HRilData::DataLinkCapabilityUpdated(
}
int32_t HRilData::GetLinkCapabilityResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilDataLinkCapability)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -346,7 +346,7 @@ int32_t HRilData::GetLinkCapabilityResponse(
}
int32_t HRilData::GetLinkBandwidthInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(HRilLinkBandwidthInfo)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -370,7 +370,7 @@ int32_t HRilData::GetLinkBandwidthInfoResponse(
}
int32_t HRilData::SetDataPermittedResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetDataPermittedResponse);
}

View File

@ -284,13 +284,13 @@ void HRilManager::ReportResponse(std::vector<std::unique_ptr<T>> &subModules, in
} else {
TELEPHONY_LOGI("requestId:%{public}d", reqInfo->request);
}
HRilRadioResponseInfo responseInfo = {};
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo = {};
responseInfo.serial = reqInfo->serial;
responseInfo.error = (HRilErrType)reportInfo->error;
responseInfo.type = HRIL_RESPONSE_REQUEST;
responseInfo.error = (HDI::Ril::V1_1::RilErrType)reportInfo->error;
responseInfo.type = HDI::Ril::V1_1::RIL_RESPONSE_REQUEST;
if (HRIL_NEED_ACK == reportInfo->ack) {
ApplyRunningLock();
responseInfo.type = HRIL_RESPONSE_REQUEST_MUST_ACK;
responseInfo.type = HDI::Ril::V1_1::RIL_RESPONSE_REQUEST_MUST_ACK;
}
int32_t requestId = reqInfo->request;
ReleaseHRilRequest(requestId, reqInfo);
@ -301,7 +301,7 @@ template<typename T>
void HRilManager::ReportNotification(std::vector<std::unique_ptr<T>> &subModules, int32_t slotId,
const ReportInfo *reportInfo, const uint8_t *response, size_t responseLen)
{
int32_t notifyType = HRIL_RESPONSE_NOTICE;
int32_t notifyType = HDI::Ril::V1_1::RIL_RESPONSE_NOTICE;
auto iter = notificationMap_.find(reportInfo->notifyId);
if (iter != notificationMap_.end()) {
if (reportInfo->notifyId == HNOTI_NETWORK_CS_REG_STATUS_UPDATED ||
@ -312,7 +312,7 @@ void HRilManager::ReportNotification(std::vector<std::unique_ptr<T>> &subModules
}
if (NEED_LOCK == iter->second) {
ApplyRunningLock();
notifyType = HRIL_RESPONSE_NOTICE_MUST_ACK;
notifyType = HDI::Ril::V1_1::RIL_RESPONSE_NOTICE_MUST_ACK;
}
}
subModules[slotId]->template ProcessNotify<T>(notifyType, reportInfo, response, responseLen);

View File

@ -106,19 +106,19 @@ int32_t HRilModem::DsdsModeUpdated(
}
int32_t HRilModem::ShutDownResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::ShutDownResponse);
}
int32_t HRilModem::SetRadioStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetRadioStateResponse);
}
int32_t HRilModem::GetRadioStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(int32_t)) != 0) {
TELEPHONY_LOGE("Invalid parameter, responseLen:%{public}zu", responseLen);
@ -132,7 +132,7 @@ int32_t HRilModem::GetRadioStateResponse(
}
int32_t HRilModem::GetImeiResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(char)) != 0) {
TELEPHONY_LOGE("GetImeiResponse:Invalid parameter, responseLen:%{public}zu", responseLen);
@ -146,7 +146,7 @@ int32_t HRilModem::GetImeiResponse(
}
int32_t HRilModem::GetMeidResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(char)) != 0) {
TELEPHONY_LOGE("GetMeidResponse:Invalid parameter, responseLen:%{public}zu", responseLen);
@ -160,13 +160,13 @@ int32_t HRilModem::GetMeidResponse(
}
int32_t HRilModem::GetVoiceRadioTechnologyResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::VoiceRadioTechnology voiceRadioTech = {};
if (response == nullptr) {
TELEPHONY_LOGE("GetVoiceRadioTechnologyResponse Invalid response: nullptr");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
BuildIVoiceRadioTechnology(voiceRadioTech, *(const HRilVoiceRadioInfo *)response);
@ -189,7 +189,7 @@ void HRilModem::BuildIVoiceRadioTechnology(
}
int32_t HRilModem::GetBasebandVersionResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) || (responseLen % sizeof(char)) != 0) {
TELEPHONY_LOGE("GetBasebandVersionResponse:Invalid parameter, responseLen:%{public}zu", responseLen);

View File

@ -186,13 +186,13 @@ int32_t HRilNetwork::GetNrSsbId(int32_t serialId)
}
int32_t HRilNetwork::GetSignalStrengthResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::Rssi rssi = {};
if (response == nullptr || responseLen != sizeof(HRilRssi)) {
TELEPHONY_LOGE("GetSignalStrengthResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
ExchangeRilRssiToHdf(response, rssi);
@ -201,13 +201,13 @@ int32_t HRilNetwork::GetSignalStrengthResponse(
}
int32_t HRilNetwork::GetCsRegStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CsRegStatusInfo csRegStatusInfo = {};
if (response == nullptr || responseLen != sizeof(HRilRegStatusInfo)) {
TELEPHONY_LOGE("GetCsRegStatusResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
const HRilRegStatusInfo *hrilRegStatusInfo = static_cast<const HRilRegStatusInfo *>(response);
@ -225,13 +225,13 @@ int32_t HRilNetwork::GetCsRegStatusResponse(
}
int32_t HRilNetwork::GetPsRegStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::PsRegStatusInfo psRegStatusInfo = {};
if (response == nullptr || responseLen != sizeof(HRilRegStatusInfo)) {
TELEPHONY_LOGE("GetPsRegStatusResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
const HRilRegStatusInfo *hrilRegStatusInfo = static_cast<const HRilRegStatusInfo *>(response);
@ -255,13 +255,13 @@ int32_t HRilNetwork::GetPsRegStatusResponse(
}
int32_t HRilNetwork::GetOperatorInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::OperatorInfo operatorInfoResult = {};
if (response == nullptr || responseLen == 0) {
TELEPHONY_LOGE("GetOperatorInfoResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
char **resp = static_cast<char **>(const_cast<void *>(response));
@ -276,13 +276,13 @@ int32_t HRilNetwork::GetOperatorInfoResponse(
}
int32_t HRilNetwork::GetNetworkSearchInformationResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::AvailableNetworkList availableNetworkList = {};
if (response == nullptr || responseLen == 0) {
TELEPHONY_LOGE("GetNetworkSearchInformationResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
availableNetworkList.itemNum = 0;
@ -293,13 +293,13 @@ int32_t HRilNetwork::GetNetworkSearchInformationResponse(
}
int32_t HRilNetwork::GetNetworkSelectionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::SetNetworkModeInfo selectModeInfo = {};
if (response == nullptr || responseLen != sizeof(int32_t)) {
TELEPHONY_LOGE("GetNetworkSelectionModeResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
int32_t *resp = static_cast<int32_t *>(const_cast<void *>(response));
@ -310,25 +310,25 @@ int32_t HRilNetwork::GetNetworkSelectionModeResponse(
}
int32_t HRilNetwork::SetNetworkSelectionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetNetworkSelectionModeResponse);
}
int32_t HRilNetwork::SetPreferredNetworkResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetPreferredNetworkResponse);
}
int32_t HRilNetwork::GetPreferredNetworkResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::PreferredNetworkTypeInfo preferredNetworkTypeInfo = {};
if (response == nullptr || responseLen != sizeof(int32_t)) {
TELEPHONY_LOGE("GetPreferredNetworkResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
int32_t *resp = static_cast<int32_t *>(const_cast<void *>(response));
@ -339,13 +339,13 @@ int32_t HRilNetwork::GetPreferredNetworkResponse(
}
int32_t HRilNetwork::GetNeighboringCellInfoListResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CellListNearbyInfo cellInfoList;
if (response == nullptr || responseLen != sizeof(CellInfoList)) {
TELEPHONY_LOGE("GetNeighboringCellInfoListResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
cellInfoList.itemNum = 0;
@ -359,13 +359,13 @@ int32_t HRilNetwork::GetNeighboringCellInfoListResponse(
}
int32_t HRilNetwork::GetNeighboringCellInfoListResponse_1_2(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_2::CellListNearbyInfo_1_2 cellInfoList;
if (response == nullptr || responseLen != sizeof(CellInfoList)) {
TELEPHONY_LOGE("response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
cellInfoList.itemNum = 0;
@ -379,13 +379,13 @@ int32_t HRilNetwork::GetNeighboringCellInfoListResponse_1_2(
}
int32_t HRilNetwork::GetCurrentCellInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CellListCurrentInfo cellList;
if (response == nullptr || responseLen != sizeof(CurrentCellInfoList)) {
TELEPHONY_LOGE("GetCurrentCellInfoResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
cellList.itemNum = 0;
@ -399,13 +399,13 @@ int32_t HRilNetwork::GetCurrentCellInfoResponse(
}
int32_t HRilNetwork::GetCurrentCellInfoResponse_1_1(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CellListCurrentInfo_1_1 cellList;
if (response == nullptr || responseLen != sizeof(CurrentCellInfoList)) {
TELEPHONY_LOGE("response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
cellList.itemNum = 0;
@ -419,13 +419,13 @@ int32_t HRilNetwork::GetCurrentCellInfoResponse_1_1(
}
int32_t HRilNetwork::GetCurrentCellInfoResponse_1_2(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_2::CellListCurrentInfo_1_2 cellList;
if (response == nullptr || responseLen != sizeof(CurrentCellInfoList)) {
TELEPHONY_LOGE("response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
cellList.itemNum = 0;
@ -439,13 +439,13 @@ int32_t HRilNetwork::GetCurrentCellInfoResponse_1_2(
}
int32_t HRilNetwork::GetPhysicalChannelConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::ChannelConfigInfoList phyChnlCfgList = {};
if (response == nullptr || responseLen != sizeof(HRilChannelConfigList)) {
TELEPHONY_LOGE("GetPhysicalChannelConfigResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
phyChnlCfgList.itemNum = 0;
@ -485,37 +485,37 @@ int32_t HRilNetwork::GetPhysicalChannelConfigResponse(
}
int32_t HRilNetwork::SetLocateUpdatesResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetLocateUpdatesResponse);
}
int32_t HRilNetwork::SetNotificationFilterResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetNotificationFilterResponse);
}
int32_t HRilNetwork::SetDeviceStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetDeviceStateResponse);
}
int32_t HRilNetwork::SetNrOptionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetNrOptionModeResponse);
}
int32_t HRilNetwork::GetNrOptionModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
int32_t nrOptionMode = 0;
if (response == nullptr || responseLen != sizeof(int32_t)) {
TELEPHONY_LOGE("GetNrOptionModeResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
nrOptionMode = *(static_cast<const int32_t *>(response));
@ -525,13 +525,13 @@ int32_t HRilNetwork::GetNrOptionModeResponse(
}
int32_t HRilNetwork::GetRrcConnectionStateResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
int32_t rrcConnectionState = 0;
if (response == nullptr || responseLen != sizeof(int32_t)) {
TELEPHONY_LOGE("GetRrcConnectionStateResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
rrcConnectionState = *(static_cast<const int32_t *>(response));
@ -541,13 +541,13 @@ int32_t HRilNetwork::GetRrcConnectionStateResponse(
}
int32_t HRilNetwork::GetNrSsbIdResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_2::NrCellSsbIds nrCellSsbIds;
if (response == nullptr || responseLen != sizeof(NrCellSsbIdsVendor)) {
TELEPHONY_LOGE("Response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
nrCellSsbIds.arfcn = 0;

View File

@ -300,7 +300,7 @@ int32_t HRilSim::SendSimMatchedOperatorInfo(
}
int32_t HRilSim::GetSimIOResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::IccIoResultInfo result = {};
int32_t ret = BuildSimIOResp(result, responseInfo, response, responseLen);
@ -311,7 +311,7 @@ int32_t HRilSim::GetSimIOResponse(
}
int32_t HRilSim::GetSimStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CardStatusInfo rilCardStatus = {};
if ((response == nullptr && responseLen != 0) ||
@ -321,8 +321,8 @@ int32_t HRilSim::GetSimStatusResponse(
}
if (response == nullptr && responseLen == 0) {
TELEPHONY_LOGE("response is null");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::GetSimStatusResponse, rilCardStatus);
}
@ -334,7 +334,7 @@ int32_t HRilSim::GetSimStatusResponse(
}
int32_t HRilSim::GetImsiResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
int32_t ret = CheckCharData(response, responseLen);
if (ret != HRIL_ERR_SUCCESS) {
@ -344,13 +344,13 @@ int32_t HRilSim::GetImsiResponse(
}
int32_t HRilSim::GetSimLockStatusResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
int32_t simLockStatus = 0;
if (response == nullptr || responseLen != sizeof(int32_t)) {
TELEPHONY_LOGE("GetSimStatusResponse: Invalid response");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::GetSimLockStatusResponse, simLockStatus);
}
@ -359,7 +359,7 @@ int32_t HRilSim::GetSimLockStatusResponse(
}
int32_t HRilSim::SetSimLockResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -367,7 +367,7 @@ int32_t HRilSim::SetSimLockResponse(
}
int32_t HRilSim::ChangeSimPasswordResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -375,7 +375,7 @@ int32_t HRilSim::ChangeSimPasswordResponse(
}
int32_t HRilSim::UnlockPinResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -383,7 +383,7 @@ int32_t HRilSim::UnlockPinResponse(
}
int32_t HRilSim::UnlockPukResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -391,7 +391,7 @@ int32_t HRilSim::UnlockPukResponse(
}
int32_t HRilSim::UnlockPin2Response(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -399,7 +399,7 @@ int32_t HRilSim::UnlockPin2Response(
}
int32_t HRilSim::UnlockPuk2Response(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -407,43 +407,43 @@ int32_t HRilSim::UnlockPuk2Response(
}
int32_t HRilSim::SetActiveSimResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetActiveSimResponse);
}
int32_t HRilSim::SimStkSendTerminalResponseResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SimStkSendTerminalResponseResponse);
}
int32_t HRilSim::SimStkSendEnvelopeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SimStkSendEnvelopeResponse);
}
int32_t HRilSim::SimStkSendCallSetupRequestResultResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SimStkSendCallSetupRequestResultResponse);
}
int32_t HRilSim::SimStkIsReadyResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SimStkIsReadyResponse);
}
int32_t HRilSim::GetRadioProtocolResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::RadioProtocol radioProtocol = {};
if (response == nullptr || responseLen != sizeof(HRilRadioProtocol)) {
TELEPHONY_LOGE("GetRadioProtocolResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
BuildRadioProtocol(radioProtocol, response);
@ -456,13 +456,13 @@ int32_t HRilSim::GetRadioProtocolResponse(
}
int32_t HRilSim::SetRadioProtocolResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::RadioProtocol radioProtocol = {};
if (response == nullptr || responseLen != sizeof(HRilRadioProtocol)) {
TELEPHONY_LOGE("SetRadioProtocolResponse response is invalid");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
} else {
BuildRadioProtocol(radioProtocol, response);
@ -475,7 +475,7 @@ int32_t HRilSim::SetRadioProtocolResponse(
}
int32_t HRilSim::SimOpenLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::OpenLogicalChannelResponse pOpenLogicalChannelResponse = {};
if (response == nullptr || responseLen != sizeof(HRilOpenLogicalChannelResponse)) {
@ -492,13 +492,13 @@ int32_t HRilSim::SimOpenLogicalChannelResponse(
}
int32_t HRilSim::SimCloseLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SimCloseLogicalChannelResponse);
}
int32_t HRilSim::SimTransmitApduLogicalChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::IccIoResultInfo result = {};
int32_t ret = BuildSimIOResp(result, responseInfo, response, responseLen);
@ -509,7 +509,7 @@ int32_t HRilSim::SimTransmitApduLogicalChannelResponse(
}
int32_t HRilSim::SimTransmitApduBasicChannelResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::IccIoResultInfo result = {};
int32_t ret = BuildSimIOResp(result, responseInfo, response, responseLen);
@ -520,7 +520,7 @@ int32_t HRilSim::SimTransmitApduBasicChannelResponse(
}
int32_t HRilSim::SimAuthenticationResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::IccIoResultInfo result = {};
int32_t ret = BuildSimIOResp(result, responseInfo, response, responseLen);
@ -531,7 +531,7 @@ int32_t HRilSim::SimAuthenticationResponse(
}
int32_t HRilSim::UnlockSimLockResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::LockStatusResp result = {};
ResponseLockStatus(result, responseInfo, response, responseLen);
@ -539,13 +539,13 @@ int32_t HRilSim::UnlockSimLockResponse(
}
HDI::Ril::V1_1::IccIoResultInfo HRilSim::ProcessIccIoResponse(
HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::IccIoResultInfo result = {};
if (response == nullptr || responseLen != sizeof(HRilSimIOResponse)) {
TELEPHONY_LOGI("Invalid response: response is nullptr");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
result.response = std::string("");
return result;
@ -558,7 +558,7 @@ HDI::Ril::V1_1::IccIoResultInfo HRilSim::ProcessIccIoResponse(
}
int32_t HRilSim::SendSimMatchedOperatorInfoResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_2::IRilCallback::SendSimMatchedOperatorInfoResponse);
}
@ -718,18 +718,18 @@ bool HRilSim::BuildLockStatusResp(const void *response, size_t responseLen, HDI:
return true;
}
void HRilSim::ResponseLockStatus(HDI::Ril::V1_1::LockStatusResp &lockStatus, HRilRadioResponseInfo &responseInfo,
void HRilSim::ResponseLockStatus(HDI::Ril::V1_1::LockStatusResp &lockStatus, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
const void *response, size_t responseLen)
{
if (!BuildLockStatusResp(response, responseLen, lockStatus)) {
TELEPHONY_LOGE("Invalid ResponseLockStatus: response is error");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
}
}
int32_t HRilSim::BuildSimIOResp(HDI::Ril::V1_1::IccIoResultInfo &result, HRilRadioResponseInfo &responseInfo,
int32_t HRilSim::BuildSimIOResp(HDI::Ril::V1_1::IccIoResultInfo &result, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo,
const void *response, size_t responseLen)
{
if ((response == nullptr && responseLen != 0) ||
@ -739,8 +739,8 @@ int32_t HRilSim::BuildSimIOResp(HDI::Ril::V1_1::IccIoResultInfo &result, HRilRad
}
if (response == nullptr && responseLen == 0) {
TELEPHONY_LOGE("BuildSimIOResp response is null");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
}
result = ProcessIccIoResponse(responseInfo, response, responseLen);

View File

@ -464,7 +464,7 @@ int32_t HRilSms::UpdateCdmaSimMessage(int32_t serialId, const OHOS::HDI::Ril::V1
}
int32_t HRilSms::SendGsmSmsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::SendSmsResultInfo result =
MakeSendSmsResult(responseInfo, responseInfo.serial, response, responseLen);
@ -472,7 +472,7 @@ int32_t HRilSms::SendGsmSmsResponse(
}
int32_t HRilSms::SendCdmaSmsResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::SendSmsResultInfo result =
MakeSendSmsResult(responseInfo, responseInfo.serial, response, responseLen);
@ -480,38 +480,38 @@ int32_t HRilSms::SendCdmaSmsResponse(
}
int32_t HRilSms::AddSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
TELEPHONY_LOGI("AddSimMessageResponse send");
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::AddSimMessageResponse);
}
int32_t HRilSms::DelSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::DelSimMessageResponse);
}
int32_t HRilSms::UpdateSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::UpdateSimMessageResponse);
}
int32_t HRilSms::SetSmscAddrResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetSmscAddrResponse);
}
int32_t HRilSms::GetSmscAddrResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::ServiceCenterAddress result;
if (response == nullptr || responseLen != sizeof(HRilServiceCenterAddress)) {
TELEPHONY_LOGE("Invalid response: response is nullptr");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
result.address = std::string("");
} else {
@ -529,13 +529,13 @@ int32_t HRilSms::GetSmscAddrResponse(
}
int32_t HRilSms::SetCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCBConfigResponse);
}
int32_t HRilSms::GetCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CBConfigInfo broadcastInfo;
if (response == nullptr) {
@ -589,13 +589,13 @@ bool HRilSms::GetCBConfigInfo(
}
int32_t HRilSms::SetCdmaCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SetCdmaCBConfigResponse);
}
int32_t HRilSms::GetCdmaCBConfigResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::CdmaCBConfigInfo broadcastInfo;
if (response == nullptr || responseLen != sizeof(HRilCdmaCBConfigInfo)) {
@ -615,7 +615,7 @@ int32_t HRilSms::GetCdmaCBConfigResponse(
}
int32_t HRilSms::SendSmsMoreModeResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
HDI::Ril::V1_1::SendSmsResultInfo result =
MakeSendSmsResult(responseInfo, responseInfo.serial, response, responseLen);
@ -623,26 +623,26 @@ int32_t HRilSms::SendSmsMoreModeResponse(
}
int32_t HRilSms::SendSmsAckResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::SendSmsAckResponse);
}
int32_t HRilSms::AddCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
TELEPHONY_LOGI("receive response");
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::AddCdmaSimMessageResponse);
}
int32_t HRilSms::DelCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::DelCdmaSimMessageResponse);
}
int32_t HRilSms::UpdateCdmaSimMessageResponse(
int32_t requestNum, HRilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
int32_t requestNum, HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, const void *response, size_t responseLen)
{
return Response(responseInfo, &HDI::Ril::V1_1::IRilCallback::UpdateCdmaSimMessageResponse);
}
@ -875,13 +875,13 @@ HDI::Ril::V1_1::CBConfigReportInfo HRilSms::MakeCBConfigResult(const void *respo
}
HDI::Ril::V1_1::SendSmsResultInfo HRilSms::MakeSendSmsResult(
HRilRadioResponseInfo &responseInfo, int32_t serial, const void *response, const size_t responseLen)
HDI::Ril::V1_1::RilRadioResponseInfo &responseInfo, int32_t serial, const void *response, const size_t responseLen)
{
HDI::Ril::V1_1::SendSmsResultInfo result;
if (response == nullptr || responseLen != sizeof(HRilSmsResponse)) {
TELEPHONY_LOGE("Invalid response: response is nullptr");
if (responseInfo.error == HRilErrType::NONE) {
responseInfo.error = HRilErrType::HRIL_ERR_INVALID_RESPONSE;
if (responseInfo.error == HDI::Ril::V1_1::RilErrType::NONE) {
responseInfo.error = HDI::Ril::V1_1::RilErrType::RIL_ERR_INVALID_RESPONSE;
}
result.pdu = std::string("");
} else {

View File

@ -290,7 +290,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Call_002, Function | MediumTest | Lev
{
auto manager = std::make_shared<HRilManager>();
auto call = std::make_unique<HRilCall>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, call->GetCallListResponse(0, responseInfo, nullptr, 1));
EXPECT_NE(HDF_SUCCESS, call->DialResponse(0, responseInfo, nullptr, 1));
EXPECT_NE(HDF_SUCCESS, call->HangupResponse(0, responseInfo, nullptr, 1));
@ -480,7 +480,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Data_002, Function | MediumTest | Lev
{
auto manager = std::make_shared<HRilManager>();
auto data = std::make_unique<HRilData>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, data->ActivatePdpContextResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, data->DeactivatePdpContextResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, data->GetPdpContextListResponse(0, responseInfo, nullptr, 0));
@ -574,7 +574,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Modem_002, Function | MediumTest | Le
{
auto manager = std::make_shared<HRilManager>();
auto modem = std::make_unique<HRilModem>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, modem->ShutDownResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, modem->SetRadioStateResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, modem->GetRadioStateResponse(0, responseInfo, nullptr, 0));
@ -661,7 +661,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Sim_002, Function | MediumTest | Leve
{
auto manager = std::make_shared<HRilManager>();
auto sim = std::make_unique<HRilSim>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, sim->GetSimIOResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, sim->GetSimStatusResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, sim->GetImsiResponse(0, responseInfo, nullptr, 0));
@ -720,7 +720,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Network_002, Function | MediumTest |
{
auto manager = std::make_shared<HRilManager>();
auto network = std::make_unique<HRilNetwork>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, network->GetSignalStrengthResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, network->GetCsRegStatusResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, network->GetPsRegStatusResponse(0, responseInfo, nullptr, 0));
@ -1085,7 +1085,7 @@ HWTEST_F(BranchTest, Telephony_HrilManager_Sms_002, Function | MediumTest | Leve
{
auto manager = std::make_shared<HRilManager>();
auto sms = std::make_unique<HRilSms>(0);
HRilRadioResponseInfo responseInfo;
HDI::Ril::V1_1::RilRadioResponseInfo responseInfo;
EXPECT_NE(HDF_SUCCESS, sms->SendGsmSmsResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, sms->SendCdmaSmsResponse(0, responseInfo, nullptr, 0));
EXPECT_NE(HDF_SUCCESS, sms->AddSimMessageResponse(0, responseInfo, nullptr, 0));