From 1c3dcd3289cf7ae1aa9584f948d349a06118b5bd Mon Sep 17 00:00:00 2001 From: allenwtsu Date: Fri, 25 Sep 2020 17:58:01 +0800 Subject: [PATCH] [SMS] Define new SMS error code in HAL 1.6 Define 3 SMS failure causes. SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWD ACCESS_BARRED BLOCKED_DUE_TO_CALL Test: build pass Bug: 162364146 Change-Id: I3b8b3f238821f2a516f8590f90cba4d603d3783b Merged-In: I3b8b3f238821f2a516f8590f90cba4d603d3783b --- radio/1.6/IRadio.hal | 64 ++ radio/1.6/IRadioResponse.hal | 136 +++- radio/1.6/types.hal | 25 + radio/1.6/vts/functional/Android.bp | 1 + .../1.6/vts/functional/radio_hidl_hal_api.cpp | 165 ++++- .../vts/functional/radio_hidl_hal_test.cpp | 2 +- .../functional/radio_hidl_hal_utils_v1_6.h | 606 +++++++++------ radio/1.6/vts/functional/radio_response.cpp | 689 +++++++++--------- .../1.6/vts/functional/vts_test_util_v1_6.cpp | 52 ++ radio/1.6/vts/functional/vts_test_util_v1_6.h | 28 + 10 files changed, 1205 insertions(+), 563 deletions(-) create mode 100644 radio/1.6/vts/functional/vts_test_util_v1_6.cpp create mode 100644 radio/1.6/vts/functional/vts_test_util_v1_6.h diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal index c3f15f48ae..002b183635 100644 --- a/radio/1.6/IRadio.hal +++ b/radio/1.6/IRadio.hal @@ -16,6 +16,9 @@ package android.hardware.radio@1.6; + +import @1.0::CdmaSmsMessage; +import @1.0::GsmSmsMessage; import @1.2::DataRequestReason; import @1.5::IRadio; import @1.5::AccessNetwork; @@ -87,4 +90,65 @@ interface IRadio extends @1.5::IRadio { oneway setupDataCall_1_6(int32_t serial, AccessNetwork accessNetwork, DataProfileInfo dataProfileInfo, bool roamingAllowed, DataRequestReason reason, vec addresses, vec dnses); + + /** + * Send an SMS message + * + * @param serial Serial number of request. + * @param message GsmSmsMessage as defined in types.hal + * + * Response function is IRadioResponse.sendSmsResponse_1_6() + * + * Note this API is the same as the 1.0 + * + * Based on the return error, caller decides to resend if sending sms + * fails. RadioError:SMS_SEND_FAIL_RETRY means retry (i.e. error cause is 332) + * and RadioError:GENERIC_FAILURE means no retry (i.e. error cause is 500) + */ + oneway sendSms_1_6(int32_t serial, GsmSmsMessage message); + + /** + * Send an SMS message. Identical to sendSms_1_6, + * except that more messages are expected to be sent soon. If possible, + * keep SMS relay protocol link open (eg TS 27.005 AT+CMMS command) + * + * @param serial Serial number of request. + * @param message GsmSmsMessage as defined in types.hal + * + * Response function is IRadioResponse.sendSMSExpectMoreResponse_1_6() + * + * Note this API is the same as the 1.0 + * + * Based on the return error, caller decides to resend if sending sms + * fails. RadioError:SMS_SEND_FAIL_RETRY means retry (i.e. error cause is 332) + * and RadioError:GENERIC_FAILURE means no retry (i.e. error cause is 500) + */ + oneway sendSMSExpectMore_1_6(int32_t serial, GsmSmsMessage message); + + /** + * Send a CDMA SMS message + * + * @param serial Serial number of request. + * @param sms Cdma Sms to be sent described by CdmaSmsMessage in types.hal + * + * Response callback is IRadioResponse.sendCdmaSmsResponse_1_6() + * + * Note this API is the same as the 1.0 + * + */ + oneway sendCdmaSms_1_6(int32_t serial, CdmaSmsMessage sms); + + /** + * Send an SMS message. Identical to sendCdmaSms_1_6, + * except that more messages are expected to be sent soon. + * + * @param serial Serial number of request. + * @param sms Cdma Sms to be sent described by CdmaSmsMessage in types.hal + * + * Response callback is IRadioResponse.sendCdmaSMSExpectMoreResponse_1_6() + * + * Note this API is the same as the 1.5 + * + */ + oneway sendCdmaSmsExpectMore_1_6(int32_t serial, CdmaSmsMessage sms); }; diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index e91b9c1a5f..dfacd666d2 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -16,7 +16,8 @@ package android.hardware.radio@1.6; -import @1.0::RadioResponseInfo; +import @1.0::SendSmsResult; +import @1.6::RadioResponseInfo; import @1.5::IRadioResponse; import @1.6::SetupDataCallResult; @@ -54,4 +55,137 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:SIM_ABSENT */ oneway getDataCallListResponse_1_6(RadioResponseInfo info, vec dcResponse); + + /** + * @param info Response info struct containing response type, serial no. and error + * @param sms Response to sms sent as defined by SendSmsResult in types.hal + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:SMS_SEND_FAIL_RETRY + * RadioError:NETWORK_REJECT + * RadioError:INVALID_STATE + * RadioError:INVALID_ARGUMENTS + * RadioError:NO_MEMORY + * RadioError:REQUEST_RATE_LIMITED + * RadioError:INVALID_SMS_FORMAT + * RadioError:SYSTEM_ERR + * RadioError:ENCODING_ERR + * RadioError:INVALID_SMSC_ADDRESS + * RadioError:MODEM_ERR + * RadioError:NETWORK_ERR + * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:INVALID_MODEM_STATE + * RadioError:NETWORK_NOT_READY + * RadioError:OPERATION_NOT_ALLOWED + * RadioError:NO_RESOURCES + * RadioError:CANCELLED + * RadioError:SIM_ABSENT + * RadioError:ACCESS_BARRED + * RadioError:BLOCKED_DUE_TO_CALL + */ + oneway sendSmsResponse_1_6(RadioResponseInfo info, SendSmsResult sms); + + /** + * @param info Response info struct containing response type, serial no. and error + * @param sms Response to sms sent as defined by SendSmsResult in types.hal + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:SMS_SEND_FAIL_RETRY + * RadioError:NETWORK_REJECT + * RadioError:INVALID_STATE + * RadioError:INVALID_ARGUMENTS + * RadioError:NO_MEMORY + * RadioError:REQUEST_RATE_LIMITED + * RadioError:INVALID_SMS_FORMAT + * RadioError:SYSTEM_ERR + * RadioError:FDN_CHECK_FAILURE + * RadioError:ENCODING_ERR + * RadioError:INVALID_SMSC_ADDRESS + * RadioError:MODEM_ERR + * RadioError:NETWORK_ERR + * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:INVALID_MODEM_STATE + * RadioError:NETWORK_NOT_READY + * RadioError:OPERATION_NOT_ALLOWED + * RadioError:NO_RESOURCES + * RadioError:CANCELLED + * RadioError:SIM_ABSENT + * RadioError:ACCESS_BARRED + * RadioError:BLOCKED_DUE_TO_CALL + */ + oneway sendSMSExpectMoreResponse_1_6(RadioResponseInfo info, SendSmsResult sms); + + /** + * @param info Response info struct containing response type, serial no. and error + * @param sms Sms result struct as defined by SendSmsResult in types.hal + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:INVALID_ARGUMENTS + * RadioError:SMS_SEND_FAIL_RETRY + * RadioError:NETWORK_REJECT + * RadioError:INVALID_STATE + * RadioError:NO_MEMORY + * RadioError:REQUEST_RATE_LIMITED + * RadioError:INVALID_SMS_FORMAT + * RadioError:SYSTEM_ERR + * RadioError:FDN_CHECK_FAILURE + * RadioError:MODEM_ERR + * RadioError:NETWORK_ERR + * RadioError:ENCODING_ERR + * RadioError:INVALID_SMSC_ADDRESS + * RadioError:INTERNAL_ERR + * RadioError:SYSTEM_ERR + * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED + * RadioError:ENCODING_ERR + * RadioError:NO_RESOURCES + * RadioError:CANCELLED + * RadioError:SIM_ABSENT + * RadioError:SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED + * RadioError:ACCESS_BARRED + * RadioError:BLOCKED_DUE_TO_CALL + */ + oneway sendCdmaSmsResponse_1_6(RadioResponseInfo info, SendSmsResult sms); + + /** + * @param info Response info struct containing response type, serial no. and error + * @param sms Response to sms sent as defined by SendSmsResult in types.hal + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:SMS_SEND_FAIL_RETRY + * RadioError:NETWORK_REJECT + * RadioError:INVALID_STATE + * RadioError:INVALID_ARGUMENTS + * RadioError:NO_MEMORY + * RadioError:REQUEST_RATE_LIMITED + * RadioError:INVALID_SMS_FORMAT + * RadioError:SYSTEM_ERR + * RadioError:FDN_CHECK_FAILURE + * RadioError:ENCODING_ERR + * RadioError:INVALID_SMSC_ADDRESS + * RadioError:MODEM_ERR + * RadioError:NETWORK_ERR + * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:INVALID_MODEM_STATE + * RadioError:NETWORK_NOT_READY + * RadioError:OPERATION_NOT_ALLOWED + * RadioError:NO_RESOURCES + * RadioError:CANCELLED + * RadioError:SIM_ABSENT + * RadioError:SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED + * RadioError:ACCESS_BARRED + * RadioError:BLOCKED_DUE_TO_CALL + */ + oneway sendCdmaSmsExpectMoreResponse_1_6(RadioResponseInfo info, SendSmsResult sms); }; diff --git a/radio/1.6/types.hal b/radio/1.6/types.hal index fbcbe976e9..51d0c47910 100644 --- a/radio/1.6/types.hal +++ b/radio/1.6/types.hal @@ -16,6 +16,8 @@ package android.hardware.radio@1.6; +import @1.0::RadioError; +import @1.0::RadioResponseType; import @1.5::SetupDataCallResult; import android.hidl.safe_union@1.0::Monostate; @@ -98,6 +100,29 @@ enum QosPortRange : int32_t { MAX = 65535 }; +enum RadioError : @1.0::RadioError { + /** 1X voice and SMS are not allowed simulteneously. */ + SIMULTANEOUS_SMS_AND_CALL_NOT_ALLOWED = 67, + + /** Access is barred. */ + ACCESS_BARRED = 68, + + /** + * SMS is blocked due to call control, e.g., resource unavailable + * in the SMR entity. + */ + BLOCKED_DUE_TO_CALL = 69 +}; + +/** + * Overwritten from @1.0::RadioResponseInfo in order to update the RadioError to 1.6 version. + */ +struct RadioResponseInfo { + RadioResponseType type; // Response type + int32_t serial; // Serial number of the request + RadioError error; // Response error +}; + /** * Defines range of ports. start and end are the first and last port numbers * (inclusive) in the range. Both start and end are in QosPortRange.MIN to diff --git a/radio/1.6/vts/functional/Android.bp b/radio/1.6/vts/functional/Android.bp index a6cfc6f631..5fd30ce78f 100644 --- a/radio/1.6/vts/functional/Android.bp +++ b/radio/1.6/vts/functional/Android.bp @@ -23,6 +23,7 @@ cc_test { "radio_response.cpp", "radio_indication.cpp", "VtsHalRadioV1_6TargetTest.cpp", + "vts_test_util_v1_6.cpp", ], static_libs: [ "RadioVtsTestUtilBase", diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index 0bfce4d0bf..300f748476 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -65,12 +65,165 @@ TEST_P(RadioHidlTest_v1_6, setupDataCall_1_6) { EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); if (cardStatus.base.base.base.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error, - {RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE, - RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW})); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::SIM_ABSENT, + ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, + ::android::hardware::radio::V1_6::RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW})); } else if (cardStatus.base.base.base.cardState == CardState::PRESENT) { - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error, - {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, - RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW})); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::NONE, + ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, + ::android::hardware::radio::V1_6::RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW})); + } +} + +/* + * Test IRadio_1_6.sendSms() for the response returned. + */ +TEST_P(RadioHidlTest_v1_6, sendSms_1_6) { + LOG(DEBUG) << "sendSms"; + serial = GetRandomSerialNumber(); + GsmSmsMessage msg; + msg.smscPdu = ""; + msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; + + radio_v1_6->sendSms(serial, msg); + + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); + EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); + + if (cardStatus.base.base.base.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::INVALID_STATE, + ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); + EXPECT_EQ(0, radioRsp_v1_6->sendSmsResult.errorCode); + } + LOG(DEBUG) << "sendSms finished"; +} + +/* + * Test IRadio_1_6.sendSMSExpectMore() for the response returned. + */ +TEST_P(RadioHidlTest_v1_6, sendSMSExpectMore_1_6) { + LOG(DEBUG) << "sendSMSExpectMore"; + serial = GetRandomSerialNumber(); + GsmSmsMessage msg; + msg.smscPdu = ""; + msg.pdu = "01000b916105770203f3000006d4f29c3e9b01"; + + radio_v1_6->sendSMSExpectMore(serial, msg); + + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); + EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); + + if (cardStatus.base.base.base.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::INVALID_STATE, + ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); + } + LOG(DEBUG) << "sendSMSExpectMore finished"; +} + +/* + * Test IRadio_1_6.sendCdmaSms() for the response returned. + */ +TEST_P(RadioHidlTest_v1_6, sendCdmaSms_1_6) { + LOG(DEBUG) << "sendCdmaSms"; + serial = GetRandomSerialNumber(); + + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; + + // Create a CdmaSmsMessage + android::hardware::radio::V1_0::CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + + radio_v1_6->sendCdmaSms(serial, cdmaSmsMessage); + + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); + EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); + + if (cardStatus.base.base.base.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::INVALID_STATE, + ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); + } + LOG(DEBUG) << "sendCdmaSms finished"; +} + +/* + * Test IRadio_1_6.sendCdmaSmsExpectMore() for the response returned. + */ +TEST_P(RadioHidlTest_v1_6, sendCdmaSmsExpectMore_1_6) { + serial = GetRandomSerialNumber(); + + // Create a CdmaSmsAddress + CdmaSmsAddress cdmaSmsAddress; + cdmaSmsAddress.digitMode = CdmaSmsDigitMode::FOUR_BIT; + cdmaSmsAddress.numberMode = CdmaSmsNumberMode::NOT_DATA_NETWORK; + cdmaSmsAddress.numberType = CdmaSmsNumberType::UNKNOWN; + cdmaSmsAddress.numberPlan = CdmaSmsNumberPlan::UNKNOWN; + cdmaSmsAddress.digits = (std::vector){11, 1, 6, 5, 10, 7, 7, 2, 10, 3, 10, 3}; + + // Create a CdmaSmsSubAddress + CdmaSmsSubaddress cdmaSmsSubaddress; + cdmaSmsSubaddress.subaddressType = CdmaSmsSubaddressType::NSAP; + cdmaSmsSubaddress.odd = false; + cdmaSmsSubaddress.digits = (std::vector){}; + + // Create a CdmaSmsMessage + android::hardware::radio::V1_0::CdmaSmsMessage cdmaSmsMessage; + cdmaSmsMessage.teleserviceId = 4098; + cdmaSmsMessage.isServicePresent = false; + cdmaSmsMessage.serviceCategory = 0; + cdmaSmsMessage.address = cdmaSmsAddress; + cdmaSmsMessage.subAddress = cdmaSmsSubaddress; + cdmaSmsMessage.bearerData = + (std::vector){15, 0, 3, 32, 3, 16, 1, 8, 16, 53, 76, 68, 6, 51, 106, 0}; + + radio_v1_6->sendCdmaSmsExpectMore(serial, cdmaSmsMessage); + + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); + EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); + + if (cardStatus.base.base.base.cardState == CardState::ABSENT) { + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS, + ::android::hardware::radio::V1_6::RadioError::INVALID_STATE, + ::android::hardware::radio::V1_6::RadioError::SIM_ABSENT}, + CHECK_GENERAL_ERROR)); } } diff --git a/radio/1.6/vts/functional/radio_hidl_hal_test.cpp b/radio/1.6/vts/functional/radio_hidl_hal_test.cpp index 114fd1a551..3d0e71cf8b 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_test.cpp @@ -33,7 +33,7 @@ void RadioHidlTest_v1_6::SetUp() { getDataCallList(); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); - EXPECT_EQ(RadioError::NONE, radioRsp_v1_6->rspInfo.error); + EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error); sp<::android::hardware::radio::config::V1_1::IRadioConfig> radioConfig = ::android::hardware::radio::config::V1_1::IRadioConfig::getService(); diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h index 95a2d09beb..16fe8c83b2 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h +++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h @@ -33,7 +33,7 @@ #include #include -#include "vts_test_util.h" +#include "vts_test_util_v1_6.h" using namespace ::android::hardware::radio::V1_6; using namespace ::android::hardware::radio::V1_5; @@ -66,11 +66,14 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon public: hidl_vec radioBandModes; - RadioResponseInfo rspInfo; + ::android::hardware::radio::V1_6::RadioResponseInfo rspInfo; // Call hidl_vec<::android::hardware::radio::V1_2::Call> currentCalls; + // Sms + SendSmsResult sendSmsResult; + // Modem bool isModemEnabled; bool enableModemResponseToggle; @@ -99,516 +102,665 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon virtual ~RadioResponse_v1_6() = default; Return getIccCardStatusResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_0::CardStatus& cardStatus); - Return supplyIccPinForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPinForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPukForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPukForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPin2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPin2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyIccPuk2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyIccPuk2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return changeIccPinForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return changeIccPinForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return changeIccPin2ForAppResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return changeIccPin2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); - Return supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, - int32_t remainingRetries); + Return supplyNetworkDepersonalizationResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t remainingRetries); Return getCurrentCallsResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& calls); - Return dialResponse(const RadioResponseInfo& info); + Return dialResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getIMSIForAppResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& imsi); + Return getIMSIForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& imsi); - Return hangupConnectionResponse(const RadioResponseInfo& info); + Return hangupConnectionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return hangupWaitingOrBackgroundResponse(const RadioResponseInfo& info); + Return hangupWaitingOrBackgroundResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return hangupForegroundResumeBackgroundResponse(const RadioResponseInfo& info); + Return hangupForegroundResumeBackgroundResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return switchWaitingOrHoldingAndActiveResponse(const RadioResponseInfo& info); + Return switchWaitingOrHoldingAndActiveResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return conferenceResponse(const RadioResponseInfo& info); + Return conferenceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return rejectCallResponse(const RadioResponseInfo& info); + Return rejectCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getLastCallFailCauseResponse(const RadioResponseInfo& info, - const LastCallFailCauseInfo& failCauseInfo); + Return getLastCallFailCauseResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const LastCallFailCauseInfo& failCauseInfo); Return getSignalStrengthResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_0::SignalStrength& sigStrength); Return getVoiceRegistrationStateResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_0::VoiceRegStateResult& voiceRegResponse); Return getDataRegistrationStateResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_0::DataRegStateResult& dataRegResponse); - Return getOperatorResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& longName, - const ::android::hardware::hidl_string& shortName, - const ::android::hardware::hidl_string& numeric); + Return getOperatorResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& longName, + const ::android::hardware::hidl_string& shortName, + const ::android::hardware::hidl_string& numeric); - Return setRadioPowerResponse(const RadioResponseInfo& info); + Return setRadioPowerResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendDtmfResponse(const RadioResponseInfo& info); + Return sendDtmfResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); + Return sendSmsResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const SendSmsResult& sms); - Return sendSMSExpectMoreResponse(const RadioResponseInfo& info, const SendSmsResult& sms); + Return sendSMSExpectMoreResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const SendSmsResult& sms); Return setupDataCallResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const android::hardware::radio::V1_0::SetupDataCallResult& dcResponse); - Return iccIOForAppResponse(const RadioResponseInfo& info, const IccIoResult& iccIo); + Return iccIOForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const IccIoResult& iccIo); - Return sendUssdResponse(const RadioResponseInfo& info); + Return sendUssdResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return cancelPendingUssdResponse(const RadioResponseInfo& info); + Return cancelPendingUssdResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getClirResponse(const RadioResponseInfo& info, int32_t n, int32_t m); + Return getClirResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + int32_t n, int32_t m); - Return setClirResponse(const RadioResponseInfo& info); + Return setClirResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getCallForwardStatusResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& call_forwardInfos); - Return setCallForwardResponse(const RadioResponseInfo& info); + Return setCallForwardResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getCallWaitingResponse(const RadioResponseInfo& info, bool enable, - int32_t serviceClass); + Return getCallWaitingResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool enable, + int32_t serviceClass); - Return setCallWaitingResponse(const RadioResponseInfo& info); + Return setCallWaitingResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return acknowledgeLastIncomingGsmSmsResponse(const RadioResponseInfo& info); + Return acknowledgeLastIncomingGsmSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return acceptCallResponse(const RadioResponseInfo& info); + Return acceptCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return deactivateDataCallResponse(const RadioResponseInfo& info); + Return deactivateDataCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t response); + Return getFacilityLockForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, int32_t response); - Return setFacilityLockForAppResponse(const RadioResponseInfo& info, int32_t retry); + Return setFacilityLockForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, int32_t retry); - Return setBarringPasswordResponse(const RadioResponseInfo& info); + Return setBarringPasswordResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getNetworkSelectionModeResponse(const RadioResponseInfo& info, bool manual); + Return getNetworkSelectionModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool manual); - Return setNetworkSelectionModeAutomaticResponse(const RadioResponseInfo& info); + Return setNetworkSelectionModeAutomaticResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setNetworkSelectionModeManualResponse(const RadioResponseInfo& info); + Return setNetworkSelectionModeManualResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getAvailableNetworksResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& networkInfos); - Return startDtmfResponse(const RadioResponseInfo& info); + Return startDtmfResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return stopDtmfResponse(const RadioResponseInfo& info); + Return stopDtmfResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getBasebandVersionResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& version); + Return getBasebandVersionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& version); - Return separateConnectionResponse(const RadioResponseInfo& info); + Return separateConnectionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setMuteResponse(const RadioResponseInfo& info); + Return setMuteResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getMuteResponse(const RadioResponseInfo& info, bool enable); + Return getMuteResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + bool enable); - Return getClipResponse(const RadioResponseInfo& info, ClipStatus status); + Return getClipResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + ClipStatus status); Return getDataCallListResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec< android::hardware::radio::V1_0::SetupDataCallResult>& dcResponse); - Return sendOemRilRequestRawResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& data); + Return sendOemRilRequestRawResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_vec& data); Return sendOemRilRequestStringsResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data); - Return setSuppServiceNotificationsResponse(const RadioResponseInfo& info); + Return setSuppServiceNotificationsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return writeSmsToSimResponse(const RadioResponseInfo& info, int32_t index); + Return writeSmsToSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, int32_t index); - Return deleteSmsOnSimResponse(const RadioResponseInfo& info); + Return deleteSmsOnSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setBandModeResponse(const RadioResponseInfo& info); + Return setBandModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getAvailableBandModesResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& bandModes); - Return sendEnvelopeResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& commandResponse); + Return sendEnvelopeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& commandResponse); - Return sendTerminalResponseToSimResponse(const RadioResponseInfo& info); + Return sendTerminalResponseToSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return handleStkCallSetupRequestFromSimResponse(const RadioResponseInfo& info); + Return handleStkCallSetupRequestFromSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return explicitCallTransferResponse(const RadioResponseInfo& info); + Return explicitCallTransferResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setPreferredNetworkTypeResponse(const RadioResponseInfo& info); + Return setPreferredNetworkTypeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getPreferredNetworkTypeResponse(const RadioResponseInfo& info, - PreferredNetworkType nwType); + Return getPreferredNetworkTypeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + PreferredNetworkType nwType); Return getNeighboringCidsResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& cells); - Return setLocationUpdatesResponse(const RadioResponseInfo& info); + Return setLocationUpdatesResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setCdmaSubscriptionSourceResponse(const RadioResponseInfo& info); + Return setCdmaSubscriptionSourceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info); + Return setCdmaRoamingPreferenceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getCdmaRoamingPreferenceResponse(const RadioResponseInfo& info, - CdmaRoamingType type); + Return getCdmaRoamingPreferenceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, CdmaRoamingType type); - Return setTTYModeResponse(const RadioResponseInfo& info); + Return setTTYModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getTTYModeResponse(const RadioResponseInfo& info, TtyMode mode); + Return getTTYModeResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + TtyMode mode); - Return setPreferredVoicePrivacyResponse(const RadioResponseInfo& info); + Return setPreferredVoicePrivacyResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getPreferredVoicePrivacyResponse(const RadioResponseInfo& info, bool enable); + Return getPreferredVoicePrivacyResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool enable); - Return sendCDMAFeatureCodeResponse(const RadioResponseInfo& info); + Return sendCDMAFeatureCodeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendBurstDtmfResponse(const RadioResponseInfo& info); + Return sendBurstDtmfResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendCdmaSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); + Return sendCdmaSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const SendSmsResult& sms); - Return acknowledgeLastIncomingCdmaSmsResponse(const RadioResponseInfo& info); + Return acknowledgeLastIncomingCdmaSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getGsmBroadcastConfigResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& configs); - Return setGsmBroadcastConfigResponse(const RadioResponseInfo& info); + Return setGsmBroadcastConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setGsmBroadcastActivationResponse(const RadioResponseInfo& info); + Return setGsmBroadcastActivationResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getCdmaBroadcastConfigResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& configs); - Return setCdmaBroadcastConfigResponse(const RadioResponseInfo& info); + Return setCdmaBroadcastConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setCdmaBroadcastActivationResponse(const RadioResponseInfo& info); + Return setCdmaBroadcastActivationResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getCDMASubscriptionResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& mdn, - const ::android::hardware::hidl_string& hSid, - const ::android::hardware::hidl_string& hNid, - const ::android::hardware::hidl_string& min, - const ::android::hardware::hidl_string& prl); + Return getCDMASubscriptionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& mdn, + const ::android::hardware::hidl_string& hSid, + const ::android::hardware::hidl_string& hNid, + const ::android::hardware::hidl_string& min, + const ::android::hardware::hidl_string& prl); - Return writeSmsToRuimResponse(const RadioResponseInfo& info, uint32_t index); + Return writeSmsToRuimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, uint32_t index); - Return deleteSmsOnRuimResponse(const RadioResponseInfo& info); + Return deleteSmsOnRuimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getDeviceIdentityResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& imei, - const ::android::hardware::hidl_string& imeisv, - const ::android::hardware::hidl_string& esn, - const ::android::hardware::hidl_string& meid); + Return getDeviceIdentityResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& imei, + const ::android::hardware::hidl_string& imeisv, + const ::android::hardware::hidl_string& esn, + const ::android::hardware::hidl_string& meid); - Return exitEmergencyCallbackModeResponse(const RadioResponseInfo& info); + Return exitEmergencyCallbackModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getSmscAddressResponse(const RadioResponseInfo& info, - const ::android::hardware::hidl_string& smsc); + Return getSmscAddressResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& smsc); - Return setSmscAddressResponse(const RadioResponseInfo& info); + Return setSmscAddressResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return reportSmsMemoryStatusResponse(const RadioResponseInfo& info); + Return reportSmsMemoryStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return reportStkServiceIsRunningResponse(const RadioResponseInfo& info); + Return reportStkServiceIsRunningResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getCdmaSubscriptionSourceResponse(const RadioResponseInfo& info, - CdmaSubscriptionSource source); + Return getCdmaSubscriptionSourceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + CdmaSubscriptionSource source); Return requestIsimAuthenticationResponse( - const RadioResponseInfo& info, const ::android::hardware::hidl_string& response); + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ::android::hardware::hidl_string& response); - Return acknowledgeIncomingGsmSmsWithPduResponse(const RadioResponseInfo& info); + Return acknowledgeIncomingGsmSmsWithPduResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendEnvelopeWithStatusResponse(const RadioResponseInfo& info, - const IccIoResult& iccIo); + Return sendEnvelopeWithStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const IccIoResult& iccIo); Return getVoiceRadioTechnologyResponse( - const RadioResponseInfo& info, ::android::hardware::radio::V1_0::RadioTechnology rat); + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + ::android::hardware::radio::V1_0::RadioTechnology rat); Return getCellInfoListResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::CellInfo>& cellInfo); - Return setCellInfoListRateResponse(const RadioResponseInfo& info); + Return setCellInfoListRateResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setInitialAttachApnResponse(const RadioResponseInfo& info); + Return setInitialAttachApnResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getImsRegistrationStateResponse(const RadioResponseInfo& info, bool isRegistered, - RadioTechnologyFamily ratFamily); + Return getImsRegistrationStateResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool isRegistered, + RadioTechnologyFamily ratFamily); - Return sendImsSmsResponse(const RadioResponseInfo& info, const SendSmsResult& sms); + Return sendImsSmsResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const SendSmsResult& sms); - Return iccTransmitApduBasicChannelResponse(const RadioResponseInfo& info, - const IccIoResult& result); + Return iccTransmitApduBasicChannelResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const IccIoResult& result); Return iccOpenLogicalChannelResponse( - const RadioResponseInfo& info, int32_t channelId, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, int32_t channelId, const ::android::hardware::hidl_vec& selectResponse); - Return iccCloseLogicalChannelResponse(const RadioResponseInfo& info); + Return iccCloseLogicalChannelResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return iccTransmitApduLogicalChannelResponse(const RadioResponseInfo& info, - const IccIoResult& result); + Return iccTransmitApduLogicalChannelResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const IccIoResult& result); - Return nvReadItemResponse(const RadioResponseInfo& info, + Return nvReadItemResponse(const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_string& result); - Return nvWriteItemResponse(const RadioResponseInfo& info); + Return nvWriteItemResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return nvWriteCdmaPrlResponse(const RadioResponseInfo& info); + Return nvWriteCdmaPrlResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return nvResetConfigResponse(const RadioResponseInfo& info); + Return nvResetConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setUiccSubscriptionResponse(const RadioResponseInfo& info); + Return setUiccSubscriptionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setDataAllowedResponse(const RadioResponseInfo& info); + Return setDataAllowedResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getHardwareConfigResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec& config); - Return requestIccSimAuthenticationResponse(const RadioResponseInfo& info, - const IccIoResult& result); + Return requestIccSimAuthenticationResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const IccIoResult& result); - Return setDataProfileResponse(const RadioResponseInfo& info); + Return setDataProfileResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return requestShutdownResponse(const RadioResponseInfo& info); + Return requestShutdownResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getRadioCapabilityResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const android::hardware::radio::V1_0::RadioCapability& rc); Return setRadioCapabilityResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const android::hardware::radio::V1_0::RadioCapability& rc); - Return startLceServiceResponse(const RadioResponseInfo& info, - const LceStatusInfo& statusInfo); + Return startLceServiceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const LceStatusInfo& statusInfo); - Return stopLceServiceResponse(const RadioResponseInfo& info, - const LceStatusInfo& statusInfo); + Return stopLceServiceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const LceStatusInfo& statusInfo); - Return pullLceDataResponse(const RadioResponseInfo& info, const LceDataInfo& lceInfo); + Return pullLceDataResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const LceDataInfo& lceInfo); - Return getModemActivityInfoResponse(const RadioResponseInfo& info, - const ActivityStatsInfo& activityInfo); + Return getModemActivityInfoResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const ActivityStatsInfo& activityInfo); - Return setAllowedCarriersResponse(const RadioResponseInfo& info, int32_t numAllowed); + Return setAllowedCarriersResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, int32_t numAllowed); - Return getAllowedCarriersResponse(const RadioResponseInfo& info, bool allAllowed, - const CarrierRestrictions& carriers); + Return getAllowedCarriersResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool allAllowed, + const CarrierRestrictions& carriers); - Return sendDeviceStateResponse(const RadioResponseInfo& info); + Return sendDeviceStateResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setIndicationFilterResponse(const RadioResponseInfo& info); + Return setIndicationFilterResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setSimCardPowerResponse(const RadioResponseInfo& info); + Return setSimCardPowerResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return acknowledgeRequest(int32_t serial); /* 1.1 Api */ - Return setCarrierInfoForImsiEncryptionResponse(const RadioResponseInfo& info); + Return setCarrierInfoForImsiEncryptionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setSimCardPowerResponse_1_1(const RadioResponseInfo& info); + Return setSimCardPowerResponse_1_1( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return startNetworkScanResponse(const RadioResponseInfo& info); + Return startNetworkScanResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return stopNetworkScanResponse(const RadioResponseInfo& info); + Return stopNetworkScanResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return startKeepaliveResponse(const RadioResponseInfo& info, - const KeepaliveStatus& status); + Return startKeepaliveResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const KeepaliveStatus& status); - Return stopKeepaliveResponse(const RadioResponseInfo& info); + Return stopKeepaliveResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); /* 1.2 Api */ - Return setSignalStrengthReportingCriteriaResponse(const RadioResponseInfo& info); + Return setSignalStrengthReportingCriteriaResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setLinkCapacityReportingCriteriaResponse(const RadioResponseInfo& info); + Return setLinkCapacityReportingCriteriaResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getIccCardStatusResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_2::CardStatus& card_status); Return getCurrentCallsResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& calls); Return getSignalStrengthResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_2::SignalStrength& sig_strength); Return getSignalStrengthResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_4::SignalStrength& sig_strength); Return getCellInfoListResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::CellInfo>& cellInfo); Return getVoiceRegistrationStateResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_2::VoiceRegStateResult& voiceRegResponse); Return getDataRegistrationStateResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_2::DataRegStateResult& dataRegResponse); /* 1.3 Api */ - Return setSystemSelectionChannelsResponse(const RadioResponseInfo& info); + Return setSystemSelectionChannelsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return enableModemResponse(const RadioResponseInfo& info); + Return enableModemResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getModemStackStatusResponse(const RadioResponseInfo& info, const bool enabled); + Return getModemStackStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const bool enabled); /* 1.4 Api */ - Return emergencyDialResponse(const RadioResponseInfo& info); + Return emergencyDialResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return startNetworkScanResponse_1_4(const RadioResponseInfo& info); + Return startNetworkScanResponse_1_4( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getCellInfoListResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_4::CellInfo>& cellInfo); Return getDataRegistrationStateResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_4::DataRegStateResult& dataRegResponse); Return getIccCardStatusResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_4::CardStatus& card_status); Return getPreferredNetworkTypeBitmapResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_bitfield< ::android::hardware::radio::V1_4::RadioAccessFamily> networkTypeBitmap); - Return setPreferredNetworkTypeBitmapResponse(const RadioResponseInfo& info); + Return setPreferredNetworkTypeBitmapResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getDataCallListResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec< ::android::hardware::radio::V1_4::SetupDataCallResult>& dcResponse); Return setupDataCallResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const android::hardware::radio::V1_4::SetupDataCallResult& dcResponse); - Return setAllowedCarriersResponse_1_4(const RadioResponseInfo& info); + Return setAllowedCarriersResponse_1_4( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return getAllowedCarriersResponse_1_4(const RadioResponseInfo& info, - const CarrierRestrictionsWithPriority& carriers, - SimLockMultiSimPolicy multiSimPolicy); + Return getAllowedCarriersResponse_1_4( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const CarrierRestrictionsWithPriority& carriers, SimLockMultiSimPolicy multiSimPolicy); /* 1.5 Api */ - Return setSignalStrengthReportingCriteriaResponse_1_5(const RadioResponseInfo& info); + Return setSignalStrengthReportingCriteriaResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setLinkCapacityReportingCriteriaResponse_1_5(const RadioResponseInfo& info); + Return setLinkCapacityReportingCriteriaResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return enableUiccApplicationsResponse(const RadioResponseInfo& info); + Return enableUiccApplicationsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return areUiccApplicationsEnabledResponse(const RadioResponseInfo& info, bool enabled); + Return areUiccApplicationsEnabledResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool enabled); - Return canToggleUiccApplicationsEnablementResponse(const RadioResponseInfo& info, - bool canToggle); + Return canToggleUiccApplicationsEnablementResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, bool canToggle); - Return setSystemSelectionChannelsResponse_1_5(const RadioResponseInfo& info); + Return setSystemSelectionChannelsResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return startNetworkScanResponse_1_5(const RadioResponseInfo& info); + Return startNetworkScanResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return setupDataCallResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const android::hardware::radio::V1_5::SetupDataCallResult& dcResponse); Return getDataCallListResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const hidl_vec<::android::hardware::radio::V1_5::SetupDataCallResult>& dcResponse); - Return setInitialAttachApnResponse_1_5(const RadioResponseInfo& info); + Return setInitialAttachApnResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setDataProfileResponse_1_5(const RadioResponseInfo& info); + Return setDataProfileResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setRadioPowerResponse_1_5(const RadioResponseInfo& info); + Return setRadioPowerResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return setIndicationFilterResponse_1_5(const RadioResponseInfo& info); + Return setIndicationFilterResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); Return getBarringInfoResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_5::CellIdentity& cellIdentity, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>& barringInfos); Return getVoiceRegistrationStateResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_5::RegStateResult& regResponse); Return getDataRegistrationStateResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_5::RegStateResult& regResponse); Return getCellInfoListResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::CellInfo>& cellInfo); - Return setNetworkSelectionModeManualResponse_1_5(const RadioResponseInfo& info); + Return setNetworkSelectionModeManualResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info); - Return sendCdmaSmsExpectMoreResponse(const RadioResponseInfo& info, - const SendSmsResult& sms); + Return sendCdmaSmsExpectMoreResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, + const SendSmsResult& sms); Return supplySimDepersonalizationResponse( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, ::android::hardware::radio::V1_5::PersoSubstate persoType, int32_t remainingRetries); Return getIccCardStatusResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& info, const ::android::hardware::radio::V1_5::CardStatus& card_status); /* 1.6 Api */ Return setupDataCallResponse_1_6( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const android::hardware::radio::V1_6::SetupDataCallResult& dcResponse); Return getDataCallListResponse_1_6( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const hidl_vec<::android::hardware::radio::V1_6::SetupDataCallResult>& dcResponse); + + Return sendSmsResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms); + + Return sendSMSExpectMoreResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms); + + Return sendCdmaSmsResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms); + + Return sendCdmaSmsExpectMoreResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms); }; /* Callback class for radio indication */ diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index f53e199c81..a598ac17ea 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -22,435 +22,478 @@ RadioResponse_v1_6::RadioResponse_v1_6(RadioHidlTest_v1_6& parent) : parent_v1_6 /* 1.0 Apis */ Return RadioResponse_v1_6::getIccCardStatusResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_0::CardStatus& /*card_status*/) { return Void(); } -Return RadioResponse_v1_6::supplyIccPinForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::supplyIccPinForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } -Return RadioResponse_v1_6::supplyIccPukForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::supplyIccPukForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } -Return RadioResponse_v1_6::supplyIccPin2ForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::supplyIccPin2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } -Return RadioResponse_v1_6::supplyIccPuk2ForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::supplyIccPuk2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } -Return RadioResponse_v1_6::changeIccPinForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::changeIccPinForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } -Return RadioResponse_v1_6::changeIccPin2ForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*remainingRetries*/) { +Return RadioResponse_v1_6::changeIccPin2ForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } Return RadioResponse_v1_6::supplyNetworkDepersonalizationResponse( - const RadioResponseInfo& /*info*/, int32_t /*remainingRetries*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*remainingRetries*/) { return Void(); } Return RadioResponse_v1_6::getCurrentCallsResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& /*calls*/) { return Void(); } -Return RadioResponse_v1_6::dialResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::dialResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getIMSIForAppResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*imsi*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*imsi*/) { return Void(); } -Return RadioResponse_v1_6::hangupConnectionResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::hangupConnectionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::hangupWaitingOrBackgroundResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::hangupForegroundResumeBackgroundResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::switchWaitingOrHoldingAndActiveResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::conferenceResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::conferenceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::rejectCallResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::rejectCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getLastCallFailCauseResponse( - const RadioResponseInfo& /*info*/, const LastCallFailCauseInfo& /*failCauseInfo*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const LastCallFailCauseInfo& /*failCauseInfo*/) { return Void(); } Return RadioResponse_v1_6::getSignalStrengthResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_0::SignalStrength& /*sig_strength*/) { return Void(); } Return RadioResponse_v1_6::getVoiceRegistrationStateResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_0::VoiceRegStateResult& /*voiceRegResponse*/) { return Void(); } Return RadioResponse_v1_6::getDataRegistrationStateResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_0::DataRegStateResult& /*dataRegResponse*/) { return Void(); } Return RadioResponse_v1_6::getOperatorResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*longName*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*longName*/, const ::android::hardware::hidl_string& /*shortName*/, const ::android::hardware::hidl_string& /*numeric*/) { return Void(); } -Return RadioResponse_v1_6::setRadioPowerResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setRadioPowerResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendDtmfResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::sendDtmfResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendSmsResponse(const RadioResponseInfo& /*info*/, - const SendSmsResult& /*sms*/) { +Return RadioResponse_v1_6::sendSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const SendSmsResult& /*sms*/) { return Void(); } -Return RadioResponse_v1_6::sendSMSExpectMoreResponse(const RadioResponseInfo& /*info*/, - const SendSmsResult& /*sms*/) { +Return RadioResponse_v1_6::sendSMSExpectMoreResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const SendSmsResult& /*sms*/) { return Void(); } Return RadioResponse_v1_6::setupDataCallResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const android::hardware::radio::V1_0::SetupDataCallResult& /*dcResponse*/) { return Void(); } -Return RadioResponse_v1_6::iccIOForAppResponse(const RadioResponseInfo& /*info*/, - const IccIoResult& /*iccIo*/) { +Return RadioResponse_v1_6::iccIOForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const IccIoResult& /*iccIo*/) { return Void(); } -Return RadioResponse_v1_6::sendUssdResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::sendUssdResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::cancelPendingUssdResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::cancelPendingUssdResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getClirResponse(const RadioResponseInfo& /*info*/, int32_t /*n*/, - int32_t /*m*/) { +Return RadioResponse_v1_6::getClirResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, int32_t /*n*/, + int32_t /*m*/) { return Void(); } -Return RadioResponse_v1_6::setClirResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setClirResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getCallForwardStatusResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_vec& /*callForwardInfos*/) { return Void(); } -Return RadioResponse_v1_6::setCallForwardResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setCallForwardResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getCallWaitingResponse(const RadioResponseInfo& /*info*/, - bool /*enable*/, int32_t /*serviceClass*/) { +Return RadioResponse_v1_6::getCallWaitingResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*enable*/, + int32_t /*serviceClass*/) { return Void(); } -Return RadioResponse_v1_6::setCallWaitingResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setCallWaitingResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::acknowledgeLastIncomingGsmSmsResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::acceptCallResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::acceptCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::deactivateDataCallResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::deactivateDataCallResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getFacilityLockForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*response*/) { +Return RadioResponse_v1_6::getFacilityLockForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, int32_t /*response*/) { return Void(); } -Return RadioResponse_v1_6::setFacilityLockForAppResponse(const RadioResponseInfo& /*info*/, - int32_t /*retry*/) { +Return RadioResponse_v1_6::setFacilityLockForAppResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, int32_t /*retry*/) { return Void(); } -Return RadioResponse_v1_6::setBarringPasswordResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setBarringPasswordResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getNetworkSelectionModeResponse(const RadioResponseInfo& /*info*/, - bool /*manual*/) { +Return RadioResponse_v1_6::getNetworkSelectionModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*manual*/) { return Void(); } Return RadioResponse_v1_6::setNetworkSelectionModeAutomaticResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setNetworkSelectionModeManualResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getAvailableNetworksResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*networkInfos*/) { return Void(); } -Return RadioResponse_v1_6::startDtmfResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::startDtmfResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::stopDtmfResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::stopDtmfResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getBasebandVersionResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*version*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*version*/) { return Void(); } -Return RadioResponse_v1_6::separateConnectionResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::separateConnectionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setMuteResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setMuteResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getMuteResponse(const RadioResponseInfo& /*info*/, - bool /*enable*/) { +Return RadioResponse_v1_6::getMuteResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*enable*/) { return Void(); } -Return RadioResponse_v1_6::getClipResponse(const RadioResponseInfo& /*info*/, - ClipStatus /*status*/) { +Return RadioResponse_v1_6::getClipResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + ClipStatus /*status*/) { return Void(); } Return RadioResponse_v1_6::getDataCallListResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*dcResponse*/) { return Void(); } Return RadioResponse_v1_6::sendOemRilRequestRawResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*data*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_vec& /*data*/) { return Void(); } Return RadioResponse_v1_6::sendOemRilRequestStringsResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& /*data*/) { return Void(); } Return RadioResponse_v1_6::setSuppServiceNotificationsResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::writeSmsToSimResponse(const RadioResponseInfo& /*info*/, - int32_t /*index*/) { +Return RadioResponse_v1_6::writeSmsToSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, int32_t /*index*/) { return Void(); } -Return RadioResponse_v1_6::deleteSmsOnSimResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::deleteSmsOnSimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setBandModeResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setBandModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getAvailableBandModesResponse( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec& bandModes) { - rspInfo = info; - radioBandModes = bandModes; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_vec& /*bandModes*/) { return Void(); } Return RadioResponse_v1_6::sendEnvelopeResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*commandResponse*/) { return Void(); } Return RadioResponse_v1_6::sendTerminalResponseToSimResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::handleStkCallSetupRequestFromSimResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::explicitCallTransferResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::explicitCallTransferResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setPreferredNetworkTypeResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getPreferredNetworkTypeResponse(const RadioResponseInfo& /*info*/, - PreferredNetworkType /*nw_type*/) { +Return RadioResponse_v1_6::getPreferredNetworkTypeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + PreferredNetworkType /*nw_type*/) { return Void(); } Return RadioResponse_v1_6::getNeighboringCidsResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*cells*/) { return Void(); } -Return RadioResponse_v1_6::setLocationUpdatesResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setLocationUpdatesResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setCdmaSubscriptionSourceResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setCdmaRoamingPreferenceResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getCdmaRoamingPreferenceResponse(const RadioResponseInfo& /*info*/, - CdmaRoamingType /*type*/) { +Return RadioResponse_v1_6::getCdmaRoamingPreferenceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + CdmaRoamingType /*type*/) { return Void(); } -Return RadioResponse_v1_6::setTTYModeResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setTTYModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getTTYModeResponse(const RadioResponseInfo& /*info*/, - TtyMode /*mode*/) { +Return RadioResponse_v1_6::getTTYModeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, TtyMode /*mode*/) { return Void(); } Return RadioResponse_v1_6::setPreferredVoicePrivacyResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getPreferredVoicePrivacyResponse(const RadioResponseInfo& /*info*/, - bool /*enable*/) { +Return RadioResponse_v1_6::getPreferredVoicePrivacyResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*enable*/) { return Void(); } -Return RadioResponse_v1_6::sendCDMAFeatureCodeResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::sendCDMAFeatureCodeResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendBurstDtmfResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::sendBurstDtmfResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendCdmaSmsResponse(const RadioResponseInfo& /*info*/, - const SendSmsResult& /*sms*/) { +Return RadioResponse_v1_6::sendCdmaSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const SendSmsResult& /*sms*/) { return Void(); } Return RadioResponse_v1_6::acknowledgeLastIncomingCdmaSmsResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getGsmBroadcastConfigResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*configs*/) { return Void(); } -Return RadioResponse_v1_6::setGsmBroadcastConfigResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setGsmBroadcastConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setGsmBroadcastActivationResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getCdmaBroadcastConfigResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*configs*/) { return Void(); } -Return RadioResponse_v1_6::setCdmaBroadcastConfigResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setCdmaBroadcastConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setCdmaBroadcastActivationResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getCDMASubscriptionResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*mdn*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*mdn*/, const ::android::hardware::hidl_string& /*hSid*/, const ::android::hardware::hidl_string& /*hNid*/, const ::android::hardware::hidl_string& /*min*/, @@ -458,17 +501,19 @@ Return RadioResponse_v1_6::getCDMASubscriptionResponse( return Void(); } -Return RadioResponse_v1_6::writeSmsToRuimResponse(const RadioResponseInfo& /*info*/, - uint32_t /*index*/) { +Return RadioResponse_v1_6::writeSmsToRuimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, uint32_t /*index*/) { return Void(); } -Return RadioResponse_v1_6::deleteSmsOnRuimResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::deleteSmsOnRuimResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getDeviceIdentityResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*imei*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*imei*/, const ::android::hardware::hidl_string& /*imeisv*/, const ::android::hardware::hidl_string& /*esn*/, const ::android::hardware::hidl_string& /*meid*/) { @@ -476,202 +521,225 @@ Return RadioResponse_v1_6::getDeviceIdentityResponse( } Return RadioResponse_v1_6::exitEmergencyCallbackModeResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getSmscAddressResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*smsc*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*smsc*/) { return Void(); } -Return RadioResponse_v1_6::setSmscAddressResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setSmscAddressResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::reportSmsMemoryStatusResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::reportSmsMemoryStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::reportStkServiceIsRunningResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getCdmaSubscriptionSourceResponse( - const RadioResponseInfo& /*info*/, CdmaSubscriptionSource /*source*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + CdmaSubscriptionSource /*source*/) { return Void(); } Return RadioResponse_v1_6::requestIsimAuthenticationResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*response*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*response*/) { return Void(); } Return RadioResponse_v1_6::acknowledgeIncomingGsmSmsWithPduResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendEnvelopeWithStatusResponse(const RadioResponseInfo& /*info*/, - const IccIoResult& /*iccIo*/) { +Return RadioResponse_v1_6::sendEnvelopeWithStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const IccIoResult& /*iccIo*/) { return Void(); } Return RadioResponse_v1_6::getVoiceRadioTechnologyResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, ::android::hardware::radio::V1_0::RadioTechnology /*rat*/) { return Void(); } Return RadioResponse_v1_6::getCellInfoListResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec< ::android::hardware::radio::V1_0::CellInfo>& /*cellInfo*/) { return Void(); } -Return RadioResponse_v1_6::setCellInfoListRateResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setCellInfoListRateResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setInitialAttachApnResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setInitialAttachApnResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getImsRegistrationStateResponse( - const RadioResponseInfo& /*info*/, bool /*isRegistered*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*isRegistered*/, RadioTechnologyFamily /*ratFamily*/) { return Void(); } -Return RadioResponse_v1_6::sendImsSmsResponse(const RadioResponseInfo& /*info*/, - const SendSmsResult& /*sms*/) { +Return RadioResponse_v1_6::sendImsSmsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const SendSmsResult& /*sms*/) { return Void(); } Return RadioResponse_v1_6::iccTransmitApduBasicChannelResponse( - const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const IccIoResult& /*result*/) { return Void(); } Return RadioResponse_v1_6::iccOpenLogicalChannelResponse( - const RadioResponseInfo& /*info*/, int32_t /*channelId*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, int32_t /*channelId*/, const ::android::hardware::hidl_vec& /*selectResponse*/) { return Void(); } -Return RadioResponse_v1_6::iccCloseLogicalChannelResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::iccCloseLogicalChannelResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::iccTransmitApduLogicalChannelResponse( - const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const IccIoResult& /*result*/) { return Void(); } Return RadioResponse_v1_6::nvReadItemResponse( - const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*result*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_string& /*result*/) { return Void(); } -Return RadioResponse_v1_6::nvWriteItemResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::nvWriteItemResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::nvWriteCdmaPrlResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::nvWriteCdmaPrlResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::nvResetConfigResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::nvResetConfigResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setUiccSubscriptionResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setUiccSubscriptionResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setDataAllowedResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setDataAllowedResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getHardwareConfigResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec& /*config*/) { return Void(); } Return RadioResponse_v1_6::requestIccSimAuthenticationResponse( - const RadioResponseInfo& /*info*/, const IccIoResult& /*result*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const IccIoResult& /*result*/) { return Void(); } -Return RadioResponse_v1_6::setDataProfileResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setDataProfileResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::requestShutdownResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::requestShutdownResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getRadioCapabilityResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const android::hardware::radio::V1_0::RadioCapability& /*rc*/) { return Void(); } Return RadioResponse_v1_6::setRadioCapabilityResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const android::hardware::radio::V1_0::RadioCapability& /*rc*/) { return Void(); } -Return RadioResponse_v1_6::startLceServiceResponse(const RadioResponseInfo& /*info*/, - const LceStatusInfo& /*statusInfo*/) { +Return RadioResponse_v1_6::startLceServiceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const LceStatusInfo& /*statusInfo*/) { return Void(); } -Return RadioResponse_v1_6::stopLceServiceResponse(const RadioResponseInfo& /*info*/, - const LceStatusInfo& /*statusInfo*/) { +Return RadioResponse_v1_6::stopLceServiceResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const LceStatusInfo& /*statusInfo*/) { return Void(); } -Return RadioResponse_v1_6::pullLceDataResponse(const RadioResponseInfo& /*info*/, - const LceDataInfo& /*lceInfo*/) { +Return RadioResponse_v1_6::pullLceDataResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const LceDataInfo& /*lceInfo*/) { return Void(); } Return RadioResponse_v1_6::getModemActivityInfoResponse( - const RadioResponseInfo& /*info*/, const ActivityStatsInfo& /*activityInfo*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ActivityStatsInfo& /*activityInfo*/) { return Void(); } -Return RadioResponse_v1_6::setAllowedCarriersResponse(const RadioResponseInfo& /*info*/, - int32_t /*numAllowed*/) { +Return RadioResponse_v1_6::setAllowedCarriersResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + int32_t /*numAllowed*/) { return Void(); } Return RadioResponse_v1_6::getAllowedCarriersResponse( - const RadioResponseInfo& /*info*/, bool /*allAllowed*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*allAllowed*/, const CarrierRestrictions& /*carriers*/) { return Void(); } -Return RadioResponse_v1_6::sendDeviceStateResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::sendDeviceStateResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setIndicationFilterResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setIndicationFilterResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setSimCardPowerResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setSimCardPowerResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } @@ -681,368 +749,297 @@ Return RadioResponse_v1_6::acknowledgeRequest(int32_t /*serial*/) { /* 1.1 Apis */ Return RadioResponse_v1_6::setCarrierInfoForImsiEncryptionResponse( - const RadioResponseInfo& /*info*/) { + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setSimCardPowerResponse_1_1(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::setSimCardPowerResponse_1_1( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::startNetworkScanResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::startNetworkScanResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::stopNetworkScanResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::stopNetworkScanResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::startKeepaliveResponse(const RadioResponseInfo& /*info*/, - const KeepaliveStatus& /*status*/) { +Return RadioResponse_v1_6::startKeepaliveResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const KeepaliveStatus& /*status*/) { return Void(); } -Return RadioResponse_v1_6::stopKeepaliveResponse(const RadioResponseInfo& /*info*/) { +Return RadioResponse_v1_6::stopKeepaliveResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } /* 1.2 Apis */ Return RadioResponse_v1_6::setSignalStrengthReportingCriteriaResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setLinkCapacityReportingCriteriaResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getIccCardStatusResponse_1_2( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_2::CardStatus& /*card_status*/) { return Void(); } Return RadioResponse_v1_6::getCurrentCallsResponse_1_2( - const RadioResponseInfo& info, - const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& calls) { - rspInfo = info; - currentCalls = calls; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_vec<::android::hardware::radio::V1_2::Call>& /*calls*/) { return Void(); } Return RadioResponse_v1_6::getSignalStrengthResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_2::SignalStrength& /*sig_strength*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getSignalStrengthResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_4::SignalStrength& /*sig_strength*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getCellInfoListResponse_1_2( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec< ::android::hardware::radio::V1_2::CellInfo>& /*cellInfo*/) { return Void(); } Return RadioResponse_v1_6::getVoiceRegistrationStateResponse_1_2( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_2::VoiceRegStateResult& /*voiceRegResponse*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getDataRegistrationStateResponse_1_2( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_2::DataRegStateResult& /*dataRegResponse*/) { return Void(); } /* 1.3 Apis */ -Return RadioResponse_v1_6::setSystemSelectionChannelsResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setSystemSelectionChannelsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::enableModemResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::enableModemResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::getModemStackStatusResponse(const RadioResponseInfo& info, - const bool enabled) { - rspInfo = info; - isModemEnabled = enabled; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::getModemStackStatusResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const bool /*enabled*/) { return Void(); } /* 1.4 Apis */ -Return RadioResponse_v1_6::emergencyDialResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::emergencyDialResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::startNetworkScanResponse_1_4(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::startNetworkScanResponse_1_4( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getDataRegistrationStateResponse_1_4( - const RadioResponseInfo& info, - const ::android::hardware::radio::V1_4::DataRegStateResult& dataRegResponse) { - rspInfo = info; - dataRegResp = dataRegResponse; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_4::DataRegStateResult& /*dataRegResponse*/) { return Void(); } Return RadioResponse_v1_6::getCellInfoListResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec< ::android::hardware::radio::V1_4::CellInfo>& /*cellInfo*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getIccCardStatusResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_4::CardStatus& /*card_status*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getPreferredNetworkTypeBitmapResponse( - const RadioResponseInfo& info, const ::android::hardware::hidl_bitfield< - ::android::hardware::radio::V1_4::RadioAccessFamily> - networkTypeBitmap) { - rspInfo = info; - networkTypeBitmapResponse = networkTypeBitmap; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::hidl_bitfield< + ::android::hardware::radio::V1_4::RadioAccessFamily> + /*networkTypeBitmap*/) { return Void(); } Return RadioResponse_v1_6::setPreferredNetworkTypeBitmapResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getDataCallListResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_4::SetupDataCallResult>& /*dcResponse*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::setupDataCallResponse_1_4( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const android::hardware::radio::V1_4::SetupDataCallResult& /*dcResponse*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } -Return RadioResponse_v1_6::setAllowedCarriersResponse_1_4(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setAllowedCarriersResponse_1_4( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getAllowedCarriersResponse_1_4( - const RadioResponseInfo& info, const CarrierRestrictionsWithPriority& carriers, - SimLockMultiSimPolicy multiSimPolicy) { - rspInfo = info; - carrierRestrictionsResp = carriers; - multiSimPolicyResp = multiSimPolicy; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const CarrierRestrictionsWithPriority& /*carriers*/, + SimLockMultiSimPolicy /*multiSimPolicy*/) { return Void(); } /* 1.5 Apis */ Return RadioResponse_v1_6::setSignalStrengthReportingCriteriaResponse_1_5( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setLinkCapacityReportingCriteriaResponse_1_5( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::enableUiccApplicationsResponse(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::enableUiccApplicationsResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::areUiccApplicationsEnabledResponse(const RadioResponseInfo& info, - bool enabled) { - rspInfo = info; - areUiccApplicationsEnabled = enabled; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::areUiccApplicationsEnabledResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*enabled*/) { return Void(); } Return RadioResponse_v1_6::canToggleUiccApplicationsEnablementResponse( - const RadioResponseInfo& info, bool canToggle) { - rspInfo = info; - canToggleUiccApplicationsEnablement = canToggle; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, bool /*canToggle*/) { return Void(); } Return RadioResponse_v1_6::setSystemSelectionChannelsResponse_1_5( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::startNetworkScanResponse_1_5(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::startNetworkScanResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::setupDataCallResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const android::hardware::radio::V1_5::SetupDataCallResult& /* dcResponse */) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getDataCallListResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const hidl_vec<::android::hardware::radio::V1_5::SetupDataCallResult>& /* dcResponse */) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } -Return RadioResponse_v1_6::setInitialAttachApnResponse_1_5(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setInitialAttachApnResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setDataProfileResponse_1_5(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setDataProfileResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setRadioPowerResponse_1_5(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setRadioPowerResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::setIndicationFilterResponse_1_5(const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::setIndicationFilterResponse_1_5( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } Return RadioResponse_v1_6::getBarringInfoResponse( - const RadioResponseInfo& info, - const ::android::hardware::radio::V1_5::CellIdentity& cellIdentity, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_5::CellIdentity& /*cellIdentity*/, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>& - barringInfos) { - this->barringCellIdentity = cellIdentity; - this->barringInfos = barringInfos; - rspInfo = info; - parent_v1_6.notify(info.serial); + /*barringInfos*/) { return Void(); } Return RadioResponse_v1_6::getVoiceRegistrationStateResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_5::RegStateResult& /*regResponse*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getDataRegistrationStateResponse_1_5( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::radio::V1_5::RegStateResult& /*regResponse*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); return Void(); } Return RadioResponse_v1_6::getCellInfoListResponse_1_5( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec< ::android::hardware::radio::V1_5::CellInfo>& /*cellInfo*/) { return Void(); } Return RadioResponse_v1_6::setNetworkSelectionModeManualResponse_1_5( - const RadioResponseInfo& info) { - rspInfo = info; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/) { return Void(); } -Return RadioResponse_v1_6::sendCdmaSmsExpectMoreResponse(const RadioResponseInfo& info, - const SendSmsResult& /*sms*/) { - rspInfo = info; - parent_v1_6.notify(info.serial); +Return RadioResponse_v1_6::sendCdmaSmsExpectMoreResponse( + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const SendSmsResult& /*sms*/) { return Void(); } Return RadioResponse_v1_6::supplySimDepersonalizationResponse( - const RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, ::android::hardware::radio::V1_5::PersoSubstate /*persoType*/, int32_t /*remainingRetries*/) { return Void(); } Return RadioResponse_v1_6::getIccCardStatusResponse_1_5( - const RadioResponseInfo& info, - const ::android::hardware::radio::V1_5::CardStatus& card_status) { - rspInfo = info; - cardStatus = card_status; - parent_v1_6.notify(info.serial); + const ::android::hardware::radio::V1_0::RadioResponseInfo& /*info*/, + const ::android::hardware::radio::V1_5::CardStatus& /*card_status*/) { return Void(); } /* 1.6 Apis */ Return RadioResponse_v1_6::setupDataCallResponse_1_6( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const android::hardware::radio::V1_6::SetupDataCallResult& /* dcResponse */) { rspInfo = info; parent_v1_6.notify(info.serial); @@ -1050,9 +1047,45 @@ Return RadioResponse_v1_6::setupDataCallResponse_1_6( } Return RadioResponse_v1_6::getDataCallListResponse_1_6( - const RadioResponseInfo& info, + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const hidl_vec<::android::hardware::radio::V1_6::SetupDataCallResult>& /* dcResponse */) { rspInfo = info; parent_v1_6.notify(info.serial); return Void(); } + +Return RadioResponse_v1_6::sendSmsResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms) { + rspInfo = info; + sendSmsResult = sms; + parent_v1_6.notify(info.serial); + return Void(); +} + +Return RadioResponse_v1_6::sendSMSExpectMoreResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms) { + rspInfo = info; + sendSmsResult = sms; + parent_v1_6.notify(info.serial); + return Void(); +} + +Return RadioResponse_v1_6::sendCdmaSmsResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms) { + rspInfo = info; + sendSmsResult = sms; + parent_v1_6.notify(info.serial); + return Void(); +} + +Return RadioResponse_v1_6::sendCdmaSmsExpectMoreResponse_1_6( + const ::android::hardware::radio::V1_6::RadioResponseInfo& info, + const SendSmsResult& sms) { + rspInfo = info; + sendSmsResult = sms; + parent_v1_6.notify(info.serial); + return Void(); +} diff --git a/radio/1.6/vts/functional/vts_test_util_v1_6.cpp b/radio/1.6/vts/functional/vts_test_util_v1_6.cpp new file mode 100644 index 0000000000..2653865017 --- /dev/null +++ b/radio/1.6/vts/functional/vts_test_util_v1_6.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "RadioTest" + +#include +#include +#include "VtsCoreUtil.h" + +::testing::AssertionResult CheckAnyOfErrors( + ::android::hardware::radio::V1_6::RadioError err, + std::vector<::android::hardware::radio::V1_6::RadioError> errors, CheckFlag flag) { + const static vector<::android::hardware::radio::V1_6::RadioError> generalErrors = { + ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE, + ::android::hardware::radio::V1_6::RadioError::NO_MEMORY, + ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR, + ::android::hardware::radio::V1_6::RadioError::SYSTEM_ERR, + ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED, + ::android::hardware::radio::V1_6::RadioError::CANCELLED}; + if (flag == CHECK_GENERAL_ERROR || flag == CHECK_OEM_AND_GENERAL_ERROR) { + for (size_t i = 0; i < generalErrors.size(); i++) { + if (err == generalErrors[i]) { + return testing::AssertionSuccess(); + } + } + } + if (flag == CHECK_OEM_ERROR || flag == CHECK_OEM_AND_GENERAL_ERROR) { + if (err >= ::android::hardware::radio::V1_6::RadioError::OEM_ERROR_1 && + err <= ::android::hardware::radio::V1_6::RadioError::OEM_ERROR_25) { + return testing::AssertionSuccess(); + } + } + for (size_t i = 0; i < errors.size(); i++) { + if (err == errors[i]) { + return testing::AssertionSuccess(); + } + } + return testing::AssertionFailure() << "RadioError:" + toString(err) + " is returned"; +} diff --git a/radio/1.6/vts/functional/vts_test_util_v1_6.h b/radio/1.6/vts/functional/vts_test_util_v1_6.h new file mode 100644 index 0000000000..e04d201ace --- /dev/null +++ b/radio/1.6/vts/functional/vts_test_util_v1_6.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include "vts_test_util.h" + +/* + * Check multiple radio error codes which are possibly returned because of the different + * vendor/devices implementations. It allows optional checks for general errors or/and oem errors. + */ +::testing::AssertionResult CheckAnyOfErrors( + ::android::hardware::radio::V1_6::RadioError err, + std::vector<::android::hardware::radio::V1_6::RadioError> generalError, + CheckFlag flag = CHECK_DEFAULT);