From 10443083631d5c040bf04abbdc4d002727ac89ce Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Tue, 15 Nov 2022 13:27:10 -0800 Subject: [PATCH] Remove REQUEST_NOT_SUPPORTED from IRadio Existing APIs should not allow REQUEST_NOT_SUPPORTED as a valid error. VTS will be updated next to enforce this behavior. Deprecate unused APIs and remove REQUEST_NOT_SUPPORTED. Deprecated APIs will not be tested through VTS. Test: atest hal_implementation_test Bug: 254095902 Change-Id: I75861eaf632f624afd5fbee2acffb1dd5c5dde27 --- .../compatibility_matrix.current.xml | 2 +- .../hardware/radio/modem/IRadioModem.aidl | 9 ++++ .../radio/modem/IRadioModemResponse.aidl | 9 ++++ .../android/hardware/radio/modem/NvItem.aidl | 3 ++ .../hardware/radio/modem/NvWriteItem.aidl | 3 ++ .../hardware/radio/network/IRadioNetwork.aidl | 3 ++ .../radio/network/IRadioNetworkResponse.aidl | 3 ++ .../android/hardware/radio/RadioError.aidl | 3 ++ .../radio/config/IRadioConfigResponse.aidl | 2 - .../radio/data/IRadioDataResponse.aidl | 9 ---- .../messaging/IRadioMessagingResponse.aidl | 21 --------- .../hardware/radio/modem/IRadioModem.aidl | 8 ++++ .../radio/modem/IRadioModemResponse.aidl | 20 ++++----- .../android/hardware/radio/modem/NvItem.aidl | 1 + .../hardware/radio/modem/NvWriteItem.aidl | 1 + .../hardware/radio/modem/ResetNvType.aidl | 1 + .../hardware/radio/network/IRadioNetwork.aidl | 2 + .../radio/network/IRadioNetworkResponse.aidl | 22 +--------- .../hardware/radio/sim/IRadioSimResponse.aidl | 43 ++----------------- .../radio/voice/IRadioVoiceResponse.aidl | 36 ---------------- radio/aidl/compat/libradiocompat/Android.bp | 2 +- radio/aidl/compat/service/Android.bp | 2 +- radio/aidl/vts/Android.bp | 2 +- 23 files changed, 63 insertions(+), 144 deletions(-) diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml index e9690c5d90..aa8f03ffdd 100644 --- a/compatibility_matrices/compatibility_matrix.current.xml +++ b/compatibility_matrices/compatibility_matrix.current.xml @@ -475,7 +475,7 @@ android.hardware.radio.modem - 1 + 2 IRadioModem slot1 diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModem.aidl index 41eff51773..74dc39d99a 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModem.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModem.aidl @@ -41,9 +41,18 @@ interface IRadioModem { oneway void getModemActivityInfo(in int serial); oneway void getModemStackStatus(in int serial); oneway void getRadioCapability(in int serial); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvReadItem(in int serial, in android.hardware.radio.modem.NvItem itemId); oneway void nvResetConfig(in int serial, in android.hardware.radio.modem.ResetNvType resetType); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvWriteCdmaPrl(in int serial, in byte[] prl); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvWriteItem(in int serial, in android.hardware.radio.modem.NvWriteItem item); oneway void requestShutdown(in int serial); oneway void responseAcknowledgement(); diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModemResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModemResponse.aidl index dcaff45017..af8bbe1282 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModemResponse.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModemResponse.aidl @@ -42,9 +42,18 @@ interface IRadioModemResponse { oneway void getModemActivityInfoResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.ActivityStatsInfo activityInfo); oneway void getModemStackStatusResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled); oneway void getRadioCapabilityResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.modem.RadioCapability rc); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvReadItemResponse(in android.hardware.radio.RadioResponseInfo info, in String result); oneway void nvResetConfigResponse(in android.hardware.radio.RadioResponseInfo info); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvWriteCdmaPrlResponse(in android.hardware.radio.RadioResponseInfo info); + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ oneway void nvWriteItemResponse(in android.hardware.radio.RadioResponseInfo info); oneway void requestShutdownResponse(in android.hardware.radio.RadioResponseInfo info); oneway void sendDeviceStateResponse(in android.hardware.radio.RadioResponseInfo info); diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl index 3e276434ac..b80d7acde1 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl @@ -32,6 +32,9 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.radio.modem; +/** + * @deprecated NV APIs are deprecated starting from Android U. + */ @Backing(type="int") @JavaDerive(toString=true) @VintfStability enum NvItem { CDMA_MEID = 1, diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl index 17b7de0a74..6a786bc419 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl @@ -32,6 +32,9 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.radio.modem; +/** + * @deprecated NV APIs are deprecated starting from Android U. + */ @JavaDerive(toString=true) @VintfStability parcelable NvWriteItem { android.hardware.radio.modem.NvItem itemId; diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl index c115c86357..dba74bed56 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl @@ -41,6 +41,9 @@ interface IRadioNetwork { oneway void getCdmaRoamingPreference(in int serial); oneway void getCellInfoList(in int serial); oneway void getDataRegistrationState(in int serial); + /** + * @deprecated Deprecated starting from Android U. + */ oneway void getImsRegistrationState(in int serial); oneway void getNetworkSelectionMode(in int serial); oneway void getOperator(in int serial); diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl index 24d587e655..05057a1a75 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -42,6 +42,9 @@ interface IRadioNetworkResponse { oneway void getCdmaRoamingPreferenceResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CdmaRoamingType type); oneway void getCellInfoListResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.CellInfo[] cellInfo); oneway void getDataRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in android.hardware.radio.network.RegStateResult dataRegResponse); + /** + * @deprecated Deprecated starting from Android U. + */ oneway void getImsRegistrationStateResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isRegistered, in android.hardware.radio.RadioTechnologyFamily ratFamily); oneway void getNetworkSelectionModeResponse(in android.hardware.radio.RadioResponseInfo info, in boolean manual); oneway void getOperatorResponse(in android.hardware.radio.RadioResponseInfo info, in String longName, in String shortName, in String numeric); diff --git a/radio/aidl/android/hardware/radio/RadioError.aidl b/radio/aidl/android/hardware/radio/RadioError.aidl index ae58a0eb6a..61d5a77ac0 100644 --- a/radio/aidl/android/hardware/radio/RadioError.aidl +++ b/radio/aidl/android/hardware/radio/RadioError.aidl @@ -41,6 +41,9 @@ enum RadioError { * Operation requires SIM PUK2 to be entered */ SIM_PUK2 = 5, + /** + * Optional API + */ REQUEST_NOT_SUPPORTED = 6, CANCELLED = 7, /** diff --git a/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl b/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl index 929f02df0f..0d36bbd016 100644 --- a/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl +++ b/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl @@ -54,7 +54,6 @@ oneway interface IRadioConfigResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED */ void getNumOfLiveModemsResponse( in android.hardware.radio.RadioResponseInfo info, in byte numOfLiveModems); @@ -93,7 +92,6 @@ oneway interface IRadioConfigResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS */ void setNumOfLiveModemsResponse(in android.hardware.radio.RadioResponseInfo info); diff --git a/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl b/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl index 88b6c1b720..06c83c1e92 100644 --- a/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl +++ b/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl @@ -44,7 +44,6 @@ oneway interface IRadioDataResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:NO_RESOURCES- Indicates that no pdu session ids are available - * RadioError:REQUEST_NOT_SUPPORTED */ void allocatePduSessionIdResponse(in RadioResponseInfo info, in int id); @@ -57,7 +56,6 @@ oneway interface IRadioDataResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:NO_RESOURCES - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_CALL_ID */ void cancelHandoverResponse(in RadioResponseInfo info); @@ -66,7 +64,6 @@ oneway interface IRadioDataResponse { * @param info Response info struct containing response type, serial no. and error * * Valid errors returned: - * RadioError:REQUEST_NOT_SUPPORTED may be returned when HAL 1.2 or higher is supported. * RadioError:NONE indicates success. Any other error will remove the network from the list. * RadioError:RADIO_NOT_AVAILABLE * RadioError:INVALID_CALL_ID @@ -112,7 +109,6 @@ oneway interface IRadioDataResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:NO_RESOURCES - * RadioError:REQUEST_NOT_SUPPORTED */ void releasePduSessionIdResponse(in RadioResponseInfo info); @@ -131,7 +127,6 @@ oneway interface IRadioDataResponse { * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void setDataAllowedResponse(in RadioResponseInfo info); @@ -146,7 +141,6 @@ oneway interface IRadioDataResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void setDataProfileResponse(in RadioResponseInfo info); @@ -159,7 +153,6 @@ oneway interface IRadioDataResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:MODEM_ERR * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED */ void setDataThrottlingResponse(in RadioResponseInfo info); @@ -176,7 +169,6 @@ oneway interface IRadioDataResponse { * RadioError:MODEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:NOT_PROVISIONED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -208,7 +200,6 @@ oneway interface IRadioDataResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:NO_RESOURCES - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_CALL_ID */ void startHandoverResponse(in RadioResponseInfo info); diff --git a/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl b/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl index 492755f6a1..8cbc869d33 100644 --- a/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl +++ b/radio/aidl/android/hardware/radio/messaging/IRadioMessagingResponse.aidl @@ -36,7 +36,6 @@ oneway interface IRadioMessagingResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void acknowledgeIncomingGsmSmsWithPduResponse(in RadioResponseInfo info); @@ -56,7 +55,6 @@ oneway interface IRadioMessagingResponse { * RadioError:NETWORK_NOT_READY * RadioError:INVALID_MODEM_STATE * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -73,7 +71,6 @@ oneway interface IRadioMessagingResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void acknowledgeLastIncomingGsmSmsResponse(in RadioResponseInfo info); @@ -98,7 +95,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:NO_SUCH_ENTRY * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -122,7 +118,6 @@ oneway interface IRadioMessagingResponse { * RadioError:NO_SUCH_ENTRY * RadioError:INTERNAL_ERR * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -145,7 +140,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:NO_RESOURCES * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -168,7 +162,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:NO_RESOURCES * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -191,7 +184,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:INVALID_MODEM_STATE * RadioError:NOT_PROVISIONED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -212,7 +204,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:INVALID_STATE * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -240,7 +231,6 @@ oneway interface IRadioMessagingResponse { * 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 @@ -275,7 +265,6 @@ oneway interface IRadioMessagingResponse { * RadioError:INVALID_SMSC_ADDRESS * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:ENCODING_ERR * RadioError:NO_RESOURCES @@ -308,7 +297,6 @@ oneway interface IRadioMessagingResponse { * RadioError:ENCODING_ERR * RadioError:OPERATION_NOT_ALLOWED * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NETWORK_NOT_READY * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -336,7 +324,6 @@ oneway interface IRadioMessagingResponse { * 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 @@ -368,7 +355,6 @@ oneway interface IRadioMessagingResponse { * 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 @@ -393,7 +379,6 @@ oneway interface IRadioMessagingResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -414,7 +399,6 @@ oneway interface IRadioMessagingResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -434,7 +418,6 @@ oneway interface IRadioMessagingResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -455,7 +438,6 @@ oneway interface IRadioMessagingResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -476,7 +458,6 @@ oneway interface IRadioMessagingResponse { * RadioError:MODEM_ERR * RadioError:NO_RESOURCES * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -502,7 +483,6 @@ oneway interface IRadioMessagingResponse { * RadioError:INVALID_MODEM_STATE * RadioError:INVALID_SMSC_ADDRESS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -531,7 +511,6 @@ oneway interface IRadioMessagingResponse { * RadioError:INVALID_SMSC_ADDRESS * RadioError:RADIO_NOT_AVAILABLE * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE * RadioError:SIM_ABSENT diff --git a/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl b/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl index ba0ddb94b1..a5d98d3e25 100644 --- a/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl +++ b/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl @@ -117,6 +117,8 @@ oneway interface IRadioModem { * @param itemId NvItem * * Response function is IRadioModemResponse.nvReadItemResponse() + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvReadItem(in int serial, in NvItem itemId); @@ -128,6 +130,8 @@ oneway interface IRadioModem { * @param resetType ResetNvType * * Response function is IRadioModemResponse.nvResetConfigResponse() + * + * Note: This will be deprecated in favor of a rebootModem API in Android U. */ void nvResetConfig(in int serial, in ResetNvType resetType); @@ -139,6 +143,8 @@ oneway interface IRadioModem { * @param prl PRL as a byte array * * Response function is IRadioModemResponse.nvWriteCdmaPrlResponse() + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvWriteCdmaPrl(in int serial, in byte[] prl); @@ -150,6 +156,8 @@ oneway interface IRadioModem { * @param item NvWriteItem * * Response function is IRadioModemResponse.nvWriteItemResponse() + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvWriteItem(in int serial, in NvWriteItem item); diff --git a/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl b/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl index b17cac41c7..eca31924fb 100644 --- a/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl +++ b/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl @@ -61,7 +61,6 @@ oneway interface IRadioModemResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:NOT_PROVISIONED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -88,7 +87,6 @@ oneway interface IRadioModemResponse { * RadioError:NOT_PROVISIONED * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void getDeviceIdentityResponse(in RadioResponseInfo info, in String imei, in String imeisv, in String esn, in String meid); @@ -100,7 +98,6 @@ oneway interface IRadioModemResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED */ void getHardwareConfigResponse(in RadioResponseInfo info, in HardwareConfig[] config); @@ -118,7 +115,6 @@ oneway interface IRadioModemResponse { * RadioError:NOT_PROVISIONED * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void getModemActivityInfoResponse(in RadioResponseInfo info, in ActivityStatsInfo activityInfo); @@ -141,7 +137,6 @@ oneway interface IRadioModemResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:NO_RESOURCES @@ -156,7 +151,8 @@ oneway interface IRadioModemResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvReadItemResponse(in RadioResponseInfo info, in String result); @@ -166,7 +162,8 @@ oneway interface IRadioModemResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED + * + * Note: This will be deprecated in favor of a rebootModemResponse API in Android U. */ void nvResetConfigResponse(in RadioResponseInfo info); @@ -176,7 +173,8 @@ oneway interface IRadioModemResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvWriteCdmaPrlResponse(in RadioResponseInfo info); @@ -186,7 +184,8 @@ oneway interface IRadioModemResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED + * + * @deprecated NV APIs are deprecated starting from Android U. */ void nvWriteItemResponse(in RadioResponseInfo info); @@ -200,7 +199,6 @@ oneway interface IRadioModemResponse { * RadioError:NO_MEMORY * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -216,7 +214,6 @@ oneway interface IRadioModemResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -237,7 +234,6 @@ oneway interface IRadioModemResponse { * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR * RadioError:INVALID_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ diff --git a/radio/aidl/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/android/hardware/radio/modem/NvItem.aidl index 649b0d2db6..310b1ad601 100644 --- a/radio/aidl/android/hardware/radio/modem/NvItem.aidl +++ b/radio/aidl/android/hardware/radio/modem/NvItem.aidl @@ -16,6 +16,7 @@ package android.hardware.radio.modem; +/** @deprecated NV APIs are deprecated starting from Android U. */ @VintfStability @Backing(type="int") @JavaDerive(toString=true) diff --git a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl index 47fb4904ef..6472f23d78 100644 --- a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl +++ b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl @@ -18,6 +18,7 @@ package android.hardware.radio.modem; import android.hardware.radio.modem.NvItem; +/** @deprecated NV APIs are deprecated starting from Android U. */ @VintfStability @JavaDerive(toString=true) parcelable NvWriteItem { diff --git a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl index 16487f8391..6476fe8704 100644 --- a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl +++ b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl @@ -16,6 +16,7 @@ package android.hardware.radio.modem; +/** Note: This will be deprecated along with nvResetConfig in Android U. */ @VintfStability @Backing(type="int") @JavaDerive(toString=true) diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl index 574798aa59..f9789360a0 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl @@ -112,6 +112,8 @@ oneway interface IRadioNetwork { * @param serial Serial number of request. * * Response function is IRadioNetworkResponse.getImsRegistrationStateResponse() + * + * @deprecated Deprecated starting from Android U. */ void getImsRegistrationState(in int serial); diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl index fc4db2ca36..9a02fc74f9 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -57,7 +57,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES */ void getAllowedNetworkTypesBitmapResponse(in RadioResponseInfo info, in int networkTypeBitmap); @@ -74,7 +73,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -93,7 +91,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED * RadioError:NO_RESOURCES * RadioError:INTERNAL_ERR @@ -126,7 +123,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -170,7 +166,8 @@ oneway interface IRadioNetworkResponse { * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE - * RadioError:REQUEST_NOT_SUPPORTED + * + * @deprecated Deprecated starting from Android U. */ void getImsRegistrationStateResponse( in RadioResponseInfo info, in boolean isRegistered, in RadioTechnologyFamily ratFamily); @@ -187,7 +184,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -205,7 +201,6 @@ oneway interface IRadioNetworkResponse { * RadioError:NO_MEMORY * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -247,7 +242,6 @@ oneway interface IRadioNetworkResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void getVoiceRadioTechnologyResponse(in RadioResponseInfo info, in RadioTechnology rat); @@ -272,7 +266,6 @@ oneway interface IRadioNetworkResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED */ void isNrDualConnectivityEnabledResponse(in RadioResponseInfo info, in boolean isEnabled); @@ -287,7 +280,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES */ void setAllowedNetworkTypesBitmapResponse(in RadioResponseInfo info); @@ -304,7 +296,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -325,7 +316,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -342,7 +332,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -362,7 +351,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INVALID_ARGUMENTS * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void setCellInfoListRateResponse(in RadioResponseInfo info); @@ -400,7 +388,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -420,7 +407,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * @@ -443,7 +429,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * @@ -459,7 +444,6 @@ oneway interface IRadioNetworkResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_STATE */ void setNrDualConnectivityStateResponse(in RadioResponseInfo info); @@ -486,7 +470,6 @@ oneway interface IRadioNetworkResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -543,7 +526,6 @@ oneway interface IRadioNetworkResponse { * RadioError:INVALID_ARGUMENTS * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void supplyNetworkDepersonalizationResponse(in RadioResponseInfo info, in int remainingRetries); diff --git a/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl b/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl index 750a29ad83..b3df504132 100644 --- a/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl +++ b/radio/aidl/android/hardware/radio/sim/IRadioSimResponse.aidl @@ -65,7 +65,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_PUK2 */ void changeIccPin2ForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -84,7 +83,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED */ void changeIccPinForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -108,7 +106,6 @@ oneway interface IRadioSimResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED */ void getAllowedCarriersResponse(in RadioResponseInfo info, in CarrierRestrictions carriers, in SimLockMultiSimPolicy multiSimPolicy); @@ -133,7 +130,6 @@ oneway interface IRadioSimResponse { * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR * RadioError:NOT_PROVISIONED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -153,7 +149,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void getCdmaSubscriptionSourceResponse( @@ -176,7 +171,6 @@ oneway interface IRadioSimResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -191,7 +185,6 @@ oneway interface IRadioSimResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:NO_RESOURCES - * RadioError:REQUEST_NOT_SUPPORTED */ void getIccCardStatusResponse(in RadioResponseInfo info, in CardStatus cardStatus); @@ -208,7 +201,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_SIM_STATE * RadioError:SIM_ERR - * RadioError:REQUEST_NOT_SUPPORTED */ void getImsiForAppResponse(in RadioResponseInfo info, in String imsi); @@ -219,13 +211,10 @@ oneway interface IRadioSimResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * REQUEST_NOT_SUPPORTED may only be returned on devices that don't support this API, - * indicated by the HAL capability CAPABILITY_SIM_PHONEBOOK_IN_MODEM. */ void getSimPhonebookCapacityResponse(in RadioResponseInfo info, in PhonebookCapacity capacity); @@ -235,13 +224,10 @@ oneway interface IRadioSimResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR - * REQUEST_NOT_SUPPORTED may only be returned on devices that don't support this API, - * indicated by the HAL capability CAPABILITY_SIM_PHONEBOOK_IN_MODEM. */ void getSimPhonebookRecordsResponse(in RadioResponseInfo info); @@ -255,7 +241,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void iccCloseLogicalChannelResponse(in RadioResponseInfo info); @@ -274,7 +259,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_SIM_STATE * RadioError:SIM_ERR - * RadioError:REQUEST_NOT_SUPPORTED */ void iccIoForAppResponse(in RadioResponseInfo info, in IccIoResult iccIo); @@ -296,7 +280,6 @@ oneway interface IRadioSimResponse { * RadioError:SIM_ERR * RadioError:INVALID_SIM_STATE * RadioError:MISSING_RESOURCE - * RadioError:REQUEST_NOT_SUPPORTED */ void iccOpenLogicalChannelResponse( in RadioResponseInfo info, in int channelId, in byte[] selectResponse); @@ -312,7 +295,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void iccTransmitApduBasicChannelResponse(in RadioResponseInfo info, in IccIoResult result); @@ -327,7 +309,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void iccTransmitApduLogicalChannelResponse(in RadioResponseInfo info, in IccIoResult result); @@ -341,7 +322,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void reportStkServiceIsRunningResponse(in RadioResponseInfo info); @@ -359,7 +339,6 @@ oneway interface IRadioSimResponse { * RadioError:INVALID_MODEM_STATE * RadioError:SIM_ERR * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED */ void requestIccSimAuthenticationResponse(in RadioResponseInfo info, in IccIoResult result); @@ -379,7 +358,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void sendEnvelopeResponse(in RadioResponseInfo info, in String commandResponse); @@ -397,7 +375,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void sendEnvelopeWithStatusResponse(in RadioResponseInfo info, in IccIoResult iccIo); @@ -415,7 +392,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void sendTerminalResponseToSimResponse(in RadioResponseInfo info); @@ -427,7 +403,6 @@ oneway interface IRadioSimResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED */ void setAllowedCarriersResponse(in RadioResponseInfo info); @@ -435,12 +410,11 @@ oneway interface IRadioSimResponse { * @param info Response info struct containing response type, serial no. and error * * Valid errors returned: - * RadioError:RIL_E_SUCCESS - * RadioError:RIL_E_RADIO_NOT_AVAILABLE + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE * RadioError:SIM_ABSENT - * RadioError:RIL_E_REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS - * RadioError:MODEM_INTERNAL_FAILURE + * RadioError:INTERNAL_FAILURE */ void setCarrierInfoForImsiEncryptionResponse(in RadioResponseInfo info); @@ -456,7 +430,6 @@ oneway interface IRadioSimResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void setCdmaSubscriptionSourceResponse(in RadioResponseInfo info); @@ -477,7 +450,6 @@ oneway interface IRadioSimResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_STATE * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -507,7 +479,6 @@ oneway interface IRadioSimResponse { * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -527,7 +498,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_PUK2 */ void supplyIccPin2ForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -546,7 +516,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED */ void supplyIccPinForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -564,7 +533,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED */ void supplyIccPuk2ForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -582,7 +550,6 @@ oneway interface IRadioSimResponse { * RadioError:CANCELLED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE - * RadioError:REQUEST_NOT_SUPPORTED */ void supplyIccPukForAppResponse(in RadioResponseInfo info, in int remainingRetries); @@ -603,7 +570,6 @@ oneway interface IRadioSimResponse { * RadioError:MODEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:NO_RESOURCES - * RadioError:REQUEST_NOT_SUPPORTED */ void supplySimDepersonalizationResponse( in RadioResponseInfo info, in PersoSubstate persoType, in int remainingRetries); @@ -616,7 +582,6 @@ oneway interface IRadioSimResponse { * Valid errors returned: * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS * RadioError:INVALID_SIM_STATE * RadioError:MODEM_ERR @@ -624,8 +589,6 @@ oneway interface IRadioSimResponse { * RadioError:SIM_ERR * RadioError:NO_SUCH_ENTRY * RadioError:NO_RESOURCES - * REQUEST_NOT_SUPPORTED may only be returned on devices that don't support this API, - * indicated by the HAL capability CAPABILITY_SIM_PHONEBOOK_IN_MODEM. */ void updateSimPhonebookRecordsResponse(in RadioResponseInfo info, in int updatedRecordIndex); } diff --git a/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl b/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl index cf1b953fc6..39e3aced92 100644 --- a/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl +++ b/radio/aidl/android/hardware/radio/voice/IRadioVoiceResponse.aidl @@ -42,7 +42,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_CALL_ID * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -71,7 +70,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_STATE * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -92,7 +90,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -122,7 +119,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:ABORTED * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:CANCELLED */ @@ -163,7 +159,6 @@ oneway interface IRadioVoiceResponse { * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:SIM_ABSENT @@ -185,7 +180,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_CALL_ID * RadioError:OPERATION_NOT_ALLOWED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -212,7 +206,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SYSTEM_ERR * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -241,7 +234,6 @@ oneway interface IRadioVoiceResponse { * RadioError:FDN_CHECK_FAILURE * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -260,7 +252,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -282,7 +273,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:FDN_CHECK_FAILURE * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_ARGUMENTS * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -298,7 +288,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:INVALID_ARGUMENTS - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -344,7 +333,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_ARGUMENTS * RadioError:INTERNAL_ERR * RadioError:MODEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -367,7 +355,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_ARGUMENTS * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -386,7 +373,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -404,7 +390,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -423,7 +408,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_ARGUMENTS * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:SIM_ABSENT */ void handleStkCallSetupRequestFromSimResponse(in RadioResponseInfo info); @@ -442,7 +426,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_CALL_ID * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:REQUEST_NOT_SUPPORTED */ void hangupConnectionResponse(in RadioResponseInfo info); @@ -461,7 +444,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -482,7 +464,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED */ void hangupWaitingOrBackgroundResponse(in RadioResponseInfo info); @@ -497,7 +478,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY - * RadioError:REQUEST_NOT_SUPPORTED */ void isVoNrEnabledResponse(in RadioResponseInfo info, in boolean enable); @@ -516,7 +496,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -536,7 +515,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INVALID_CALL_ID * RadioError:INVALID_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE @@ -557,7 +535,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INVALID_CALL_ID * RadioError:INVALID_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -578,7 +555,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_CALL_ID * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE */ @@ -603,7 +579,6 @@ oneway interface IRadioVoiceResponse { * RadioError:ABORTED * RadioError:SYSTEM_ERR * RadioError:INVALID_STATE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -625,7 +600,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_CALL_ID * RadioError:OPERATION_NOT_ALLOWED - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:CANCELLED */ @@ -647,7 +621,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_STATE * RadioError:FDN_CHECK_FAILURE - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -670,7 +643,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INVALID_STATE * RadioError:FDN_CHECK_FAILURE * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -690,7 +662,6 @@ oneway interface IRadioVoiceResponse { * RadioError:NO_MEMORY * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -707,7 +678,6 @@ oneway interface IRadioVoiceResponse { * RadioError:REQUEST_RATE_LIMITED * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -724,7 +694,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_CALL_ID * RadioError:NO_RESOURCES * RadioError:CANCELLED @@ -742,7 +711,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED */ @@ -758,7 +726,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR * RadioError:NO_MEMORY - * RadioError:REQUEST_NOT_SUPPORTED */ void setVoNrEnabledResponse(in RadioResponseInfo info); @@ -776,7 +743,6 @@ oneway interface IRadioVoiceResponse { * RadioError:INTERNAL_ERR * RadioError:INVALID_CALL_ID * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE */ @@ -796,7 +762,6 @@ oneway interface IRadioVoiceResponse { * RadioError:MODEM_ERR * RadioError:INTERNAL_ERR * RadioError:INVALID_CALL_ID - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE */ @@ -817,7 +782,6 @@ oneway interface IRadioVoiceResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_ARGUMENTS * RadioError:SYSTEM_ERR - * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED diff --git a/radio/aidl/compat/libradiocompat/Android.bp b/radio/aidl/compat/libradiocompat/Android.bp index 0ceaec49dd..557e461cfe 100644 --- a/radio/aidl/compat/libradiocompat/Android.bp +++ b/radio/aidl/compat/libradiocompat/Android.bp @@ -39,7 +39,7 @@ cc_library { "android.hardware.radio.data-V1-ndk", "android.hardware.radio.ims-V1-ndk", "android.hardware.radio.messaging-V1-ndk", - "android.hardware.radio.modem-V1-ndk", + "android.hardware.radio.modem-V2-ndk", "android.hardware.radio.network-V2-ndk", "android.hardware.radio.sim-V1-ndk", "android.hardware.radio.voice-V1-ndk", diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp index d16773e6a7..692f15a8af 100644 --- a/radio/aidl/compat/service/Android.bp +++ b/radio/aidl/compat/service/Android.bp @@ -42,7 +42,7 @@ cc_binary { "android.hardware.radio.data-V1-ndk", "android.hardware.radio.ims-V1-ndk", "android.hardware.radio.messaging-V1-ndk", - "android.hardware.radio.modem-V1-ndk", + "android.hardware.radio.modem-V2-ndk", "android.hardware.radio.network-V2-ndk", "android.hardware.radio.sim-V1-ndk", "android.hardware.radio.voice-V1-ndk", diff --git a/radio/aidl/vts/Android.bp b/radio/aidl/vts/Android.bp index bb992c9e76..4df54f768f 100644 --- a/radio/aidl/vts/Android.bp +++ b/radio/aidl/vts/Android.bp @@ -71,7 +71,7 @@ cc_test { "android.hardware.radio.data-V1-ndk", "android.hardware.radio.ims-V1-ndk", "android.hardware.radio.messaging-V1-ndk", - "android.hardware.radio.modem-V1-ndk", + "android.hardware.radio.modem-V2-ndk", "android.hardware.radio.network-V2-ndk", "android.hardware.radio.sim-V1-ndk", "android.hardware.radio.voice-V1-ndk",