We are not deprecating nvResetConfig
At least not soon.
Bug: 310710841
Test: m
Change-Id: Ifdad73a5536644e73bb3ee0fd15ce68aa48fa8ed
diff --git a/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl b/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl
index bfca5a9..491657c 100644
--- a/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl
+++ b/radio/aidl/android/hardware/radio/modem/IRadioModem.aidl
@@ -139,15 +139,14 @@
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);
diff --git a/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl b/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl
index 6d2504c..498f228 100644
--- a/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl
+++ b/radio/aidl/android/hardware/radio/modem/IRadioModemResponse.aidl
@@ -175,8 +175,6 @@
* 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);
diff --git a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
index b6be54d..71736d8 100644
--- a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
+++ b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
@@ -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 @@
@SuppressWarnings(value={"redundant-name"})
enum ResetNvType {
/**
- * Reload all NV items
+ * Reload all NV items. This may reboot modem.
*/
RELOAD,
/**