Merge "Add setSatellitePlmn() related HAL apis" into main (c0d7c4d3) · 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
		@@ -82,4 +82,5 @@ interface IRadioNetwork {
		oneway void isNullCipherAndIntegrityEnabled(in int serial);
		oneway void isN1ModeEnabled(in int serial);
		oneway void setN1ModeEnabled(in int serial, boolean enable);
		oneway void setSatellitePlmn(in int serial, in List<String> plmnList);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,4 +81,5 @@ interface IRadioNetworkResponse {
		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 setSatellitePlmnResponse(in android.hardware.radio.RadioResponseInfo info);
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -556,4 +556,18 @@ oneway interface IRadioNetwork {
		* Response function is IRadioNetworkResponse.setN1ModeEnabledResponse()
		*/
		void setN1ModeEnabled(in int serial, boolean enable);

		/**
		* Set the non-terrestrial PLMN with lower priority than terrestrial networks.
		* MCC/MNC broadcast by the non-terrestrial networks may not be included in OPLMNwACT file on
		* SIM profile. Acquisition of satellite based system is lower priority to terrestrial
		* networks. UE shall make all attempts to acquire terrestrial service prior to camping on
		* satellite LTE service.
		*
		* @param serial Serial number of request.
		* @param plmnList The list of roaming PLMN used for connecting to satellite networks.
		*
		* Response function is IRadioNetworkResponse.setSatellitePlmnResponse()
		*/
		void setSatellitePlmn(in int serial, in List<String> plmnList);
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -668,4 +668,21 @@ oneway interface IRadioNetworkResponse {
		* RadioError:INVALID_STATE
		*/
		void setN1ModeEnabledResponse(in RadioResponseInfo info);

		/**
		* Response of setSatellitePlmn.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		*
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:INVALID_ARGUMENTS
		* RadioError:INVALID_MODEM_STATE
		* RadioError:MODEM_ERR
		* RadioError:NO_RESOURCES
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void setSatellitePlmnResponse(in RadioResponseInfo info);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,9 @@ class RadioNetwork : public RadioCompatBase,
		::ndk::ScopedAStatus setNullCipherAndIntegrityEnabled(int32_t serial, bool enabled) override;
		::ndk::ScopedAStatus isNullCipherAndIntegrityEnabled(int32_t serial) override;

		::ndk::ScopedAStatus setSatellitePlmn(int32_t serial,
		const std::vector<std::string>& plmnList) override;

		protected:
		std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond();