Merge "Add isN1ModeEnabled and setN1ModeEnabled to IRadioNetwork" (a5fa2dfd) · Commits · e / os / android_hardware_interfaces

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,4 +78,6 @@ 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 isN1ModeEnabled(in int serial);
		oneway void setN1ModeEnabled(in int serial, boolean enable);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -77,4 +77,6 @@ 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 isN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled);
		oneway void setN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -504,4 +504,30 @@ oneway interface IRadioNetwork {
		* Response callback is IRadioResponse.setNullCipherAndIntegrityEnabledResponse()
		*/
		void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);

		/**
		* Checks whether N1 mode (access to 5G core network) is enabled or not.
		*
		* @param serial Serial number of request.
		*
		* Response function is IRadioNetworkResponse.isN1ModeEnabledResponse()
		*/
		void isN1ModeEnabled(in int serial);

		/**
		* Enables or disables N1 mode (access to 5G core network) in accordance with
		* 3GPP TS 24.501 4.9.
		*
		* Note: The default value of N1 mode shall be based on the modem's internal configuration
		* as per device or carrier. This API may be invoked on demand first to disable N1 mode and
		* later to re-enable for certain use case. This setting shall not be persisted by modem.
		* This setting shall not interfere with the allowed network type bitmap set using
		* {@link IRadioNetwork#setAllowedNetworkTypesBitmap()} API.
		*
		* @param serial Serial number of request.
		* @param enable {@code true} to enable N1 mode, {@code false} to disable N1 mode.
		*
		* Response function is IRadioNetworkResponse.setN1ModeEnabledResponse()
		*/
		void setN1ModeEnabled(in int serial, boolean enable);
		}

+30 −0

Original line number	Diff line number	Diff line
		@@ -624,4 +624,34 @@ oneway interface IRadioNetworkResponse {
		* RadioError:MODEM_ERR
		*/
		void setNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info);

		/**
		* Response of isN1ModeEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		* @param isEnabled Indicates whether N1 mode is enabled or not.
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void isN1ModeEnabledResponse(in RadioResponseInfo info, boolean isEnabled);

		/**
		* Response of setN1ModeEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:REQUEST_NOT_SUPPORTED
		* RadioError:INVALID_STATE
		*/
		void setN1ModeEnabledResponse(in RadioResponseInfo info);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ class RadioNetwork : public RadioCompatBase,
		scanTrigger) override;
		::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial, bool resetScan) override;
		::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;
		::ndk::ScopedAStatus isN1ModeEnabled(int32_t serial) override;
		::ndk::ScopedAStatus setN1ModeEnabled(int32_t serial, bool enable) override;

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