Merge "Add isNullCipherAndIntegrityEnabled HAL API" (cdbbcbf1) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ interface IRadioNetwork {
		oneway void cancelEmergencyNetworkScan(int serial, boolean resetScan);
		oneway void exitEmergencyMode(in int serial);
		oneway void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);
		oneway void isNullCipherAndIntegrityEnabled(in int serial);
		oneway void isN1ModeEnabled(in int serial);
		oneway void setN1ModeEnabled(in int serial, boolean enable);
		oneway void setLocationPrivacySetting(in int serial, in boolean shareLocation);

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ interface IRadioNetworkResponse {
		oneway void exitEmergencyModeResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void cancelEmergencyNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void setNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void isNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled);
		oneway void isN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled);
		oneway void setN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
		oneway void setLocationPrivacySettingResponse(in android.hardware.radio.RadioResponseInfo info);

+15 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,21 @@ oneway interface IRadioNetwork {
		*/
		void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);

		/**
		* Get whether null encryption and integrity modes are enabled.
		*
		* Null ciphering and integrity modes include, (but are not limited to):
		* 2G: A5/0, GAE0 (no integrity algorithm supported)
		* 3G: UEA0 and UIA0
		* 4G: EEA0 and EIA
		* 5G: NEA0 and NIA0
		*
		* @param serial Serial number of the request.
		*
		* Response callback is IRadioNetworkResponse.isNullCipherAndIntegrityEnabledResponse()
		*/
		void isNullCipherAndIntegrityEnabled(in int serial);

		/**
		* Checks whether N1 mode (access to 5G core network) is enabled or not.
		*

+11 −0

Original line number	Diff line number	Diff line
		@@ -625,6 +625,17 @@ oneway interface IRadioNetworkResponse {
		*/
		void setNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info);

		/**
		* @param info Response info struct containing response type, serial no. and error
		* @param enabled the last known state of null ciphering and integrity algorithms
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:MODEM_ERR
		*/
		void isNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info, in boolean isEnabled);

		/**
		* Response of isN1ModeEnabled.
		* This is an optional API.

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ class RadioNetwork : public RadioCompatBase,
		::ndk::ScopedAStatus setN1ModeEnabled(int32_t serial, bool enable) override;

		::ndk::ScopedAStatus setNullCipherAndIntegrityEnabled(int32_t serial, bool enabled) override;
		::ndk::ScopedAStatus isNullCipherAndIntegrityEnabled(int32_t serial) override;

		::ndk::ScopedAStatus setLocationPrivacySetting(int32_t serial, bool shareLocation) override;
		::ndk::ScopedAStatus getLocationPrivacySetting(int32_t serial) override;