Merge "Deprecate remaining NV APIs: all reset types except reboot" into main (36ab73b4) · Commits · e / os / android_hardware_interfaces

radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ResetNvType.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,12 @@ package android.hardware.radio.modem;
		@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
		enum ResetNvType {
		RELOAD,
		/**
		* @deprecated NV APIs are deprecated starting from Android U.
		*/
		ERASE,
		/**
		* @deprecated NV APIs are deprecated starting from Android U.
		*/
		FACTORY_RESET,
		}

+4 −3

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

		/**
		* Reset the radio NV configuration.
		* Reboots modem.
		*
		* This is also used to reboot the modem with ResetNvType.RELOAD.
		* This was historically used to reset NV configuration, but starting from Android U, NV APIs
		* are deprecated.
		*
		* @param serial Serial number of request.
		* @param resetType Type of reset operation
		* @param resetType Always ResetNvType.RELOAD.
		*
		* Response function is IRadioModemResponse.nvResetConfigResponse()
		*/

+7 −1

Original line number	Diff line number	Diff line
		@@ -25,15 +25,21 @@ package android.hardware.radio.modem;
		@SuppressWarnings(value={"redundant-name"})
		enum ResetNvType {
		/**
		* Reload all NV items. This may reboot modem.
		* Reboot modem.
		*
		* Historically, this has been also reloading all NV items.
		*/
		RELOAD,
		/**
		* Erase NV reset (SCRTN)
		*
		* @deprecated NV APIs are deprecated starting from Android U.
		*/
		ERASE,
		/**
		* Factory reset (RTN)
		*
		* @deprecated NV APIs are deprecated starting from Android U.
		*/
		FACTORY_RESET,
		}