Merge "We are not deprecating nvResetConfig" into main (d6ed8de9) · Commits · e / os / android_hardware_interfaces

radio/aidl/android/hardware/radio/modem/IRadioModem.aidl

+4 −5

Original line number	Diff line number	Diff line
		@@ -139,15 +139,14 @@ oneway interface IRadioModem {
		void nvReadItem(in int serial, in NvItem itemId);

		/**
		* Reset the radio NV configuration to the factory state.
		* This is used for device configuration by some CDMA operators.
		* Reset the radio NV configuration.
		*
		* This is also used to reboot the modem with ResetNvType.RELOAD.
		*
		* @param serial Serial number of request.
		* @param resetType ResetNvType
		* @param resetType Type of reset operation
		*
		* 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);

+0 −2

Original line number	Diff line number	Diff line
		@@ -175,8 +175,6 @@ oneway interface IRadioModemResponse {
		* Valid errors returned:
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		*
		* Note: This will be deprecated in favor of a rebootModemResponse API in Android U.
		*/
		void nvResetConfigResponse(in RadioResponseInfo info);

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.hardware.radio.modem;

		/**
		* Note: This will be deprecated along with nvResetConfig in Android U.
		* @hide
		*/
		@VintfStability
		@@ -26,7 +25,7 @@ package android.hardware.radio.modem;
		@SuppressWarnings(value={"redundant-name"})
		enum ResetNvType {
		/**
		* Reload all NV items
		* Reload all NV items. This may reboot modem.
		*/
		RELOAD,
		/**