diff --git a/current.txt b/current.txt index f6a3a87e5e..b364dbaa44 100644 --- a/current.txt +++ b/current.txt @@ -671,20 +671,14 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar def77c7db95d374f11a111bfc4ed60f92451303642a43276c4e291988fcee625 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback 62cf050c593c1ec34b49178b5bdde72dd9b80d9bad3eb184e4f0cd564d28678c android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork 98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types -## -# BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present -## -3a303604d6c99a36c3d2a819b7908b3681b8488f89c26ea525768522c45f7f17 android.hardware.radio@1.5::types -26216f3566aff76d8a29ee95f74bcb099a05f65ead8d6d4fadafee6967889b93 android.hardware.radio@1.5::IRadio +50e22cd55ad5499e68e81541bbc67bd10e59c1b9f3ff8cc7ba70dcb0d2918381 android.hardware.radio@1.5::types +8cc3306e8cd755d04521d1611b217b9d13a2a76d2af57cbea8f875333b3363f7 android.hardware.radio@1.5::IRadio e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication -1a3324125cae8f4ca9984225d2f14bafeb835b8d9a1717fc9ed794de701f197c android.hardware.radio@1.5::IRadioResponse +7b77721a7716e163f5cc5f2830ed5616b953fcf0e5406f69de0fde5ce95e4184 android.hardware.radio@1.5::IRadioResponse 2fd107f3de1b7e36825e241a88dfae8edf3a77c166cb746f00ddf6440ab78db1 android.hardware.radio.config@1.3::types a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig 742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication 0006ab8e8b0910cbd3bbb08d5f17d5fac7d65a2bdad5f2334e4851db9d1e6fa8 android.hardware.radio.config@1.3::IRadioConfigResponse -## -# END Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present -## 51d1c8d285e0456da2a3fdfbf4700c6277165d5e83219894d651c8ea0e39aa8b android.hardware.soundtrigger@2.3::types 12d7533ff0754f45bf59ab300799074570a99a676545652c2c23abc73cb4515d android.hardware.soundtrigger@2.3::ISoundTriggerHw 7746fda1fbf9c7c132bae701cc5a161309e4f5e7f3e8065811045975ee86196d android.hardware.usb.gadget@1.1::IUsbGadget diff --git a/radio/1.5/IRadio.hal b/radio/1.5/IRadio.hal index bea0454aa3..bc405008a0 100644 --- a/radio/1.5/IRadio.hal +++ b/radio/1.5/IRadio.hal @@ -26,6 +26,7 @@ import @1.5::DataProfileInfo; import @1.5::IndicationFilter; import @1.5::LinkAddress; import @1.5::NetworkScanRequest; +import @1.5::PersoSubstate; import @1.5::RadioAccessNetworks; import @1.5::RadioAccessSpecifier; import @1.5::SignalThresholdInfo; @@ -294,4 +295,15 @@ interface IRadio extends @1.4::IRadio { * Response callback is IRadioResponse.sendCdmaSMSExpectMoreResponse() */ oneway sendCdmaSmsExpectMore(int32_t serial, CdmaSmsMessage sms); + + /** + * Requests that deactivates one category of the device personalization. + * + * @param serial Serial number of request. + * @param persoType SIM personalization type. + * @param controlKey depersonalization code corresponding to persoType + * + * Response function is IRadioResponse.supplySimDepersonalizationResponse() + */ + oneway supplySimDepersonalization(int32_t serial, PersoSubstate persoType, string controlKey); }; diff --git a/radio/1.5/IRadioResponse.hal b/radio/1.5/IRadioResponse.hal index 9fa521e792..6a2187f69d 100644 --- a/radio/1.5/IRadioResponse.hal +++ b/radio/1.5/IRadioResponse.hal @@ -23,6 +23,8 @@ import @1.5::BarringInfo; import @1.5::CellInfo; import @1.5::RegStateResult; import @1.5::SetupDataCallResult; +import @1.4::SetupDataCallResult; +import @1.5::PersoSubstate; /** * Interface declaring response functions to solicited radio requests. @@ -175,7 +177,6 @@ interface IRadioResponse extends @1.4::IRadioResponse { oneway getBarringInfoResponse(RadioResponseInfo info, vec barringInfos); /** - * @param info Response info struct containing response type, serial no. and error * @param voiceRegResponse Current Voice registration response as defined by RegStateResult * in types.hal * @@ -268,4 +269,26 @@ interface IRadioResponse extends @1.4::IRadioResponse { * RadioError:SIM_ABSENT */ oneway sendCdmaSmsExpectMoreResponse(RadioResponseInfo info, SendSmsResult sms); + + /** + * @param info Response info struct contatining response type, serial no. and error + * @param persoType SIM Personalisation type + * @param remainingRetries postiive values indicates number of retries remaining, + * must be equal to -1 if number of retries is infinite. + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:PASSWORD_INCORRECT (code is invalid) + * RadioError:NO_MEMORY + * RadioError:INVALID_SIM_STATE + * RadioError:INTERNAL_ERR + * RadioError:SYSTEM_ERR + * RadioError:MODEM_ERR + * RadioError:INVALID_ARGUMENTS + * RadioError:NO_RESOURCES + * RadioError:REQUEST_NOT_SUPPORTED + */ + oneway supplySimDepersonalizationResponse(RadioResponseInfo info, + PersoSubstate persoType, int32_t remainingRetries); }; diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal index 82feced37d..cf195ccb0a 100644 --- a/radio/1.5/types.hal +++ b/radio/1.5/types.hal @@ -23,6 +23,7 @@ import @1.0::CdmaSignalStrength; import @1.0::EvdoSignalStrength; import @1.0::GsmSignalStrength; import @1.0::LteSignalStrength; +import @1.0::PersoSubstate; import @1.0::RadioAccessFamily; import @1.0::RadioError; import @1.0::RegState; @@ -1029,3 +1030,19 @@ struct NetworkScanResult { */ vec networkInfos; }; + +/** + * Additional personalization categories in addition to those specified in 3GPP TS 22.022 and 3GPP2 C.S0068-0. + */ +enum PersoSubstate : @1.0::PersoSubstate { + SIM_SPN, + SIM_SPN_PUK, + SIM_SP_EHPLMN, // Equivalent Home PLMN + SIM_SP_EHPLMN_PUK, + SIM_ICCID, + SIM_ICCID_PUK, + SIM_IMPI, + SIM_IMPI_PUK, + SIM_NS_SP, // Network subset service provider + SIM_NS_SP_PUK, +}; diff --git a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h index 6e6576e4b4..d1c17e6fab 100644 --- a/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h +++ b/radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h @@ -114,6 +114,9 @@ class RadioResponse_v1_5 : public ::android::hardware::radio::V1_5::IRadioRespon Return supplyNetworkDepersonalizationResponse(const RadioResponseInfo& info, int32_t remainingRetries); + Return supplySimDepersonalizationResponse(const RadioResponseInfo& info, + ::android::hardware::radio::V1_5::PersoSubstate persoType, int32_t remainingRetries); + Return getCurrentCallsResponse( const RadioResponseInfo& info, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& calls); diff --git a/radio/1.5/vts/functional/radio_response.cpp b/radio/1.5/vts/functional/radio_response.cpp index 223acd0aa3..a62d086d80 100644 --- a/radio/1.5/vts/functional/radio_response.cpp +++ b/radio/1.5/vts/functional/radio_response.cpp @@ -62,6 +62,13 @@ Return RadioResponse_v1_5::supplyNetworkDepersonalizationResponse( return Void(); } +Return RadioResponse_v1_5::supplySimDepersonalizationResponse( + const RadioResponseInfo& /*info*/, + ::android::hardware::radio::V1_5::PersoSubstate /*persoType*/, + int32_t /*remainingRetries*/) { + return Void(); +} + Return RadioResponse_v1_5::getCurrentCallsResponse( const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_vec<::android::hardware::radio::V1_0::Call>& /*calls*/) {