Merge changes I6a62eea4,I599435cc into main
* changes:
Fix AIDL warnings in Radio HAL
Move deprecated annotation from structs to their fields
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
index b44ab71..080a877 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
@@ -35,7 +35,7 @@
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable ActivityStatsTechSpecificInfo {
- android.hardware.radio.AccessNetwork rat;
+ android.hardware.radio.AccessNetwork rat = android.hardware.radio.AccessNetwork.UNKNOWN;
int frequencyRange;
int[] txmModetimeMs;
int rxModeTimeMs;
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/DeviceStateType.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/DeviceStateType.aidl
index 1159f93..023658c 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/DeviceStateType.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/DeviceStateType.aidl
@@ -33,7 +33,7 @@
package android.hardware.radio.modem;
/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
+@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum DeviceStateType {
POWER_SAVE_MODE,
CHARGING_STATE,
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/HardwareConfigModem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/HardwareConfigModem.aidl
index d453cb0..7d5537f 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/HardwareConfigModem.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/HardwareConfigModem.aidl
@@ -36,7 +36,7 @@
@JavaDerive(toString=true) @VintfStability
parcelable HardwareConfigModem {
int rilModel;
- android.hardware.radio.RadioTechnology rat;
+ android.hardware.radio.RadioTechnology rat = android.hardware.radio.RadioTechnology.UNKNOWN;
int maxVoiceCalls;
int maxDataCalls;
int maxStandby;
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ImeiInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ImeiInfo.aidl
index a2df30d..96fb5a8 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ImeiInfo.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ImeiInfo.aidl
@@ -35,11 +35,12 @@
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable ImeiInfo {
- android.hardware.radio.modem.ImeiInfo.ImeiType type;
+ android.hardware.radio.modem.ImeiInfo.ImeiType type = android.hardware.radio.modem.ImeiInfo.ImeiType.INVALID;
String imei;
String svn;
@Backing(type="int") @VintfStability
enum ImeiType {
+ INVALID = 0,
PRIMARY = 1,
SECONDARY = 2,
}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl
index f97b9a2..bafcd19 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvItem.aidl
@@ -32,51 +32,175 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio.modem;
-/**
- * @hide
- * @deprecated NV APIs are deprecated starting from Android U.
- */
+/* @hide */
@Backing(type="int") @JavaDerive(toString=true) @VintfStability
enum NvItem {
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
+ INVALID = 0,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_MEID = 1,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_MIN = 2,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_MDN = 3,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_ACCOLC = 4,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
DEVICE_MSL = 11,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_RECONDITIONED_STATUS = 12,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_ACTIVATION_DATE = 13,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_LIFE_TIMER = 14,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_LIFE_CALLS = 15,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_LIFE_DATA_TX = 16,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
RTN_LIFE_DATA_RX = 17,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
OMADM_HFA_LEVEL = 18,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_NAI = 31,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_HOME_ADDRESS = 32,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_AAA_AUTH = 33,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_HA_AUTH = 34,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_PRI_HA_ADDR = 35,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_SEC_HA_ADDR = 36,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_REV_TUN_PREF = 37,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_HA_SPI = 38,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_AAA_SPI = 39,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_MN_HA_SS = 40,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
MIP_PROFILE_MN_AAA_SS = 41,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_PRL_VERSION = 51,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_BC10 = 52,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_BC14 = 53,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_SO68 = 54,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_SO73_COP0 = 55,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_SO73_COP1TO7 = 56,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_1X_ADVANCED_ENABLED = 57,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_EHRPD_ENABLED = 58,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
CDMA_EHRPD_FORCED = 59,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_BAND_ENABLE_25 = 71,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_BAND_ENABLE_26 = 72,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_BAND_ENABLE_41 = 73,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_SCAN_PRIORITY_25 = 74,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_SCAN_PRIORITY_26 = 75,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_SCAN_PRIORITY_41 = 76,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_HIDDEN_BAND_PRIORITY_25 = 77,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_HIDDEN_BAND_PRIORITY_26 = 78,
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
LTE_HIDDEN_BAND_PRIORITY_41 = 79,
}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl
index c38ceb7..c941246 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/NvWriteItem.aidl
@@ -32,12 +32,15 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.radio.modem;
-/**
- * @hide
- * @deprecated NV APIs are deprecated starting from Android U.
- */
+/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable NvWriteItem {
- android.hardware.radio.modem.NvItem itemId;
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
+ android.hardware.radio.modem.NvItem itemId = android.hardware.radio.modem.NvItem.INVALID;
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
String value;
}
diff --git a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ResetNvType.aidl
index b4208b7..e9937f0 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ResetNvType.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/ResetNvType.aidl
@@ -33,7 +33,7 @@
package android.hardware.radio.modem;
/* @hide */
-@Backing(type="int") @JavaDerive(toString=true) @VintfStability
+@Backing(type="int") @JavaDerive(toString=true) @SuppressWarnings(value={"redundant-name"}) @VintfStability
enum ResetNvType {
RELOAD,
ERASE,
diff --git a/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl b/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
index 7ca4021..6ad47fc 100644
--- a/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
+++ b/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl
@@ -36,7 +36,7 @@
* Radio access technology. Set UNKNOWN if the Activity statistics
* is RAT independent.
*/
- AccessNetwork rat;
+ AccessNetwork rat = AccessNetwork.UNKNOWN;
/**
* Frequency range. Values are FREQUENCY_RANGE_
* Set FREQUENCY_RANGE_UNKNOWN if the Activity statistics when frequency range
diff --git a/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl b/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl
index c1f4cd6..86df920 100644
--- a/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl
+++ b/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl
@@ -20,6 +20,7 @@
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
+@SuppressWarnings(value={"redundant-name"})
enum DeviceStateType {
/**
* Device power save mode (provided by PowerManager). True indicates the device is in
diff --git a/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl b/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl
index 1ba3562..4818c9e 100644
--- a/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl
+++ b/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl
@@ -34,7 +34,7 @@
/**
* Bitset value, based on RadioTechnology.
*/
- RadioTechnology rat;
+ RadioTechnology rat = RadioTechnology.UNKNOWN;
/**
* Maximum number of concurrent active voice calls.
*/
diff --git a/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl b/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl
index 6d33505..82fade5 100644
--- a/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl
+++ b/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl
@@ -29,6 +29,8 @@
* ImeiType enum is used identify the IMEI as primary or secondary as mentioned in GSMA TS.37
*/
enum ImeiType {
+ /** Must not be used. */
+ INVALID = 0,
/**
* This is the primary IMEI of the device as mentioned in the GSMA TS.37. In a multi-SIM
* device the modem must set one IMEI with this type as mentioned in GSMA TS37_2.2_REQ_8.
@@ -40,7 +42,7 @@
}
/** Primary or secondary IMEI as mentioned in GSMA spec TS.37 */
- ImeiType type;
+ ImeiType type = ImeiType.INVALID;
/**
* IMEI value, see 3gpp spec 23.003 section 6. Note: This primary IMEI mapping must be
* permanent throughout the lifetime of the device irrespective of the factory data reset,
diff --git a/radio/aidl/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/android/hardware/radio/modem/NvItem.aidl
index b405137..d646ff7 100644
--- a/radio/aidl/android/hardware/radio/modem/NvItem.aidl
+++ b/radio/aidl/android/hardware/radio/modem/NvItem.aidl
@@ -17,7 +17,6 @@
package android.hardware.radio.modem;
/**
- * @deprecated NV APIs are deprecated starting from Android U.
* @hide
*/
@VintfStability
@@ -25,172 +24,217 @@
@JavaDerive(toString=true)
enum NvItem {
/**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
+ INVALID = 0,
+ /**
* CDMA radio and account information (items 1-10)
* CDMA MEID (hex)
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_MEID = 1,
/**
* CDMA MIN (MSID)
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_MIN = 2,
/**
* CDMA MDN
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_MDN = 3,
/**
* CDMA access overload control
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_ACCOLC = 4,
/**
* Carrier device provisioning (items 11-30)
* Device MSL
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
DEVICE_MSL = 11,
/**
* RTN reconditioned status
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_RECONDITIONED_STATUS = 12,
/**
* RTN activation date
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_ACTIVATION_DATE = 13,
/**
* RTN life timer
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_LIFE_TIMER = 14,
/**
* RTN life calls
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_LIFE_CALLS = 15,
/**
* RTN life data TX
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_LIFE_DATA_TX = 16,
/**
* RTN life data RX
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
RTN_LIFE_DATA_RX = 17,
/**
* HFA in progress
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
OMADM_HFA_LEVEL = 18,
/**
* Mobile IP profile information (items 31-50)
* NAI realm
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_NAI = 31,
/**
* MIP home address
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_HOME_ADDRESS = 32,
/**
* AAA auth
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_AAA_AUTH = 33,
/**
* HA auth
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_HA_AUTH = 34,
/**
* Primary HA address
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_PRI_HA_ADDR = 35,
/**
* Secondary HA address
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_SEC_HA_ADDR = 36,
/**
* Reverse TUN preference
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_REV_TUN_PREF = 37,
/**
* HA SPI
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_HA_SPI = 38,
/**
* AAA SPI
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_AAA_SPI = 39,
/**
* HA shared secret
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_MN_HA_SS = 40,
/**
* AAA shared secret
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
MIP_PROFILE_MN_AAA_SS = 41,
/**
* CDMA network and band config (items 51-70)
* CDMA PRL version
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_PRL_VERSION = 51,
/**
* CDMA band class 10
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_BC10 = 52,
/**
* CDMA band class 14
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_BC14 = 53,
/**
* CDMA SO68
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_SO68 = 54,
/**
* CDMA SO73 COP0
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_SO73_COP0 = 55,
/**
* CDMA SO73 COP1-7
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_SO73_COP1TO7 = 56,
/**
* CDMA 1X Advanced enabled
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_1X_ADVANCED_ENABLED = 57,
/**
* CDMA eHRPD enabled
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_EHRPD_ENABLED = 58,
/**
* CDMA eHRPD forced
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
CDMA_EHRPD_FORCED = 59,
/**
* LTE network and band config (items 71-90)
* LTE band 25 enabled
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_BAND_ENABLE_25 = 71,
/**
* LTE band 26 enabled
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_BAND_ENABLE_26 = 72,
/**
* LTE band 41 enabled
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_BAND_ENABLE_41 = 73,
/**
* LTE band 25 scan priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_SCAN_PRIORITY_25 = 74,
/**
* LTE band 26 scan priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_SCAN_PRIORITY_26 = 75,
/**
* LTE band 41 scan priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_SCAN_PRIORITY_41 = 76,
/**
* LTE hidden band 25 priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_HIDDEN_BAND_PRIORITY_25 = 77,
/**
* LTE hidden band 26 priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_HIDDEN_BAND_PRIORITY_26 = 78,
/**
* LTE hidden band 41 priority
+ * @deprecated NV APIs are deprecated starting from Android U.
*/
LTE_HIDDEN_BAND_PRIORITY_41 = 79,
}
diff --git a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl
index c57253b..482126a 100644
--- a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl
+++ b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl
@@ -19,12 +19,17 @@
import android.hardware.radio.modem.NvItem;
/**
- * @deprecated NV APIs are deprecated starting from Android U.
* @hide
*/
@VintfStability
@JavaDerive(toString=true)
parcelable NvWriteItem {
- NvItem itemId;
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
+ NvItem itemId = NvItem.INVALID;
+ /**
+ * @deprecated NV APIs are deprecated starting from Android U.
+ */
String value;
}
diff --git a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
index e290a52..b6be54d 100644
--- a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
+++ b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl
@@ -23,6 +23,7 @@
@VintfStability
@Backing(type="int")
@JavaDerive(toString=true)
+@SuppressWarnings(value={"redundant-name"})
enum ResetNvType {
/**
* Reload all NV items