Merge "Adding HAL API for disabling subscription" am: f597a4ae0e (2bee79b3) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.radio</name>
		<version>1.4</version>
		<version>1.5</version>
		<interface>
		<name>IRadio</name>
		<instance>slot1</instance>

current.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -605,10 +605,11 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar
		c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
		9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
		274fb1254a6d1a97824ec5c880eeefc0e410dc6d3a2a4c34052201169d2b7de0 android.hardware.radio@1.5::types
		c8e81d912827a5d49b2ddcdc4eb4556c5d231a899a1dca879309e04210daa4a0 android.hardware.radio@1.5::IRadio
		a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication
		260ce05806d753d728f844d405e832179ed7d9b65986ec18fef3d21cf7285587 android.hardware.radio@1.5::IRadioResponse
		4c666aaf3944ad91c2428b8456d0db4a2f81191f8c294f046a2f539e9fc7b6fd android.hardware.radio@1.5::IRadio
		3afac66f21a33bc9c4b80481c7d5540038348651d9a7d8af64ea13610af138da android.hardware.radio@1.5::IRadioIndication
		70e977f2ccefd2e503bedb3a66313639b53fbc7bde025538b07f41e2292b6624 android.hardware.radio@1.5::IRadioResponse
		55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types
		b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig
		742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication
		7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse

radio/1.5/IRadio.hal

+41 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,45 @@ interface IRadio extends @1.4::IRadio {
		*/
		oneway setSignalStrengthReportingCriteria_1_5(int32_t serial,
		SignalThresholdInfo signalThresholdInfo, AccessNetwork accessNetwork);

		/**
		* Enable or disable UiccApplications on the SIM. If disabled:
		* - Modem will not register on any network.
		* - SIM must be PRESENT, and the IccId of the SIM must still be accessible.
		* - The corresponding modem stack is still functional, e.g. able to make emergency calls or
		* do network scan.
		* By default if this API is not called, the uiccApplications must be enabled automatically.
		* It must work for both single SIM and DSDS cases for UX consistency.
		* The preference is per SIM, and must be remembered over power cycle, modem reboot, or SIM
		* insertion / unplug.
		*
		* @param serial: Serial number of request.
		* @param enable: true if to enable uiccApplications, false to disable.

		* Response callback is IRadioResponse.enableUiccApplicationsResponse()
		*/
		oneway enableUiccApplications(int32_t serial, bool enable);

		/**
		* Whether uiccApplications are enabled, or disabled.
		*
		* By default uiccApplications must be enabled, unless enableUiccApplications() with enable
		* being false is called.
		*
		* @param serial Serial number of request.
		*
		* Response callback is IRadioResponse.areUiccApplicationsEnabledResponse()
		*/
		oneway areUiccApplicationsEnabled(int32_t serial);

		/**
		* Query whether disabling and enabling UiccApplications functionality is supported. If not,
		* calling enableUiccApplications with a different value will return
		* RadioError:REQUEST_NOT_SUPPORTED.
		*
		* @param serial Serial number of request.
		*
		* Response callback is IRadioResponse.canToggleUiccApplicationsEnablementResponse()
		*/
		oneway canToggleUiccApplicationsEnablement(int32_t serial);
		};

radio/1.5/IRadioIndication.hal

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,4 +23,11 @@ import @1.4::IRadioIndication;
		* Interface declaring unsolicited radio indications.
		*/
		interface IRadioIndication extends @1.4::IRadioIndication {
		/**
		* Report change of whether uiccApplications are enabled, or disabled.
		*
		* @param type Type of radio indication
		* @param enabled whether uiccApplications are enabled, or disabled
		*/
		oneway uiccApplicationsEnablementChanged(RadioIndicationType type, bool enabled);
		};

radio/1.5/IRadioResponse.hal

+37 −0

Original line number	Diff line number	Diff line
		@@ -32,4 +32,41 @@ interface IRadioResponse extends @1.4::IRadioResponse {
		* RadioError:RADIO_NOT_AVAILABLE
		*/
		oneway setSignalStrengthReportingCriteriaResponse_1_5(RadioResponseInfo info);

		/**
		* @param info Response info struct containing response type, serial no. and error
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:SIM_ABSENT
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:BUSY
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		oneway enableUiccApplicationsResponse(RadioResponseInfo info);

		/**
		* @param info Response info struct containing response type, serial no. and error
		* @param enabled whether Uicc applications are enabled.
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:SIM_ABSENT
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		oneway areUiccApplicationsEnabledResponse(RadioResponseInfo info, bool enabled);

		/**
		* @param info Response info struct containing response type, serial no. and error
		* @param canToggle whether toggling UiccApplications functionality is supported.
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		*/
		oneway canToggleUiccApplicationsEnablementResponse(RadioResponseInfo info, bool canToggle);
		};