From bc7038f925c182550837c91772b6008ce3008cff Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Mon, 11 Nov 2024 16:19:12 -0800 Subject: [PATCH 1/2] Move deprecated annotation from structs to their fields Having (deprecated) methods with deprecated types as their arguments prevent from cleanly doing no-op implementations for them. Moving the annotation from the structure to all their fields will keep the warning anywhere they would be used, but won't bother implementations who don't really provide them. Bug: 310710841 Test: m Flag: EXEMPT aidl changes only Change-Id: I599435cc31d712c371d9d3e7fa5cc538b854cd03 --- .../android/hardware/radio/modem/NvItem.aidl | 128 +++++++++++++++++- .../hardware/radio/modem/NvWriteItem.aidl | 11 +- .../android/hardware/radio/modem/NvItem.aidl | 42 +++++- .../hardware/radio/modem/NvWriteItem.aidl | 7 +- 4 files changed, 178 insertions(+), 10 deletions(-) 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 f97b9a2017..104cb40ddc 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,171 @@ // 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. + */ 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 c38ceb779a..d9ecf65e17 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 { + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ android.hardware.radio.modem.NvItem itemId; + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ String value; } diff --git a/radio/aidl/android/hardware/radio/modem/NvItem.aidl b/radio/aidl/android/hardware/radio/modem/NvItem.aidl index b405137f56..a62624eee8 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 @@ -27,170 +26,211 @@ enum NvItem { /** * 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 c57253b76b..1c6c11ea52 100644 --- a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl +++ b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl @@ -19,12 +19,17 @@ package android.hardware.radio.modem; import android.hardware.radio.modem.NvItem; /** - * @deprecated NV APIs are deprecated starting from Android U. * @hide */ @VintfStability @JavaDerive(toString=true) parcelable NvWriteItem { + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ NvItem itemId; + /** + * @deprecated NV APIs are deprecated starting from Android U. + */ String value; } From ed43421b66ee56c879cc73abd5ce2388510bcd8f Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Wed, 13 Nov 2024 11:36:33 -0800 Subject: [PATCH 2/2] Fix AIDL warnings in Radio HAL Bug: 310710841 Test: mma in any HAL implementation folder Flag: EXEMPT aidl only Change-Id: I6a62eea436eae6b416c813f44adeacafa7f38453 --- .../hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl | 2 +- .../current/android/hardware/radio/modem/DeviceStateType.aidl | 2 +- .../android/hardware/radio/modem/HardwareConfigModem.aidl | 2 +- .../current/android/hardware/radio/modem/ImeiInfo.aidl | 3 ++- .../current/android/hardware/radio/modem/NvItem.aidl | 4 ++++ .../current/android/hardware/radio/modem/NvWriteItem.aidl | 2 +- .../current/android/hardware/radio/modem/ResetNvType.aidl | 2 +- .../hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl | 2 +- radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl | 1 + .../android/hardware/radio/modem/HardwareConfigModem.aidl | 2 +- radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl | 4 +++- radio/aidl/android/hardware/radio/modem/NvItem.aidl | 4 ++++ radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl | 2 +- radio/aidl/android/hardware/radio/modem/ResetNvType.aidl | 1 + 14 files changed, 23 insertions(+), 10 deletions(-) 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 b44ab71e3f..080a877145 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 @@ package android.hardware.radio.modem; /* @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 1159f93b51..023658ce45 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 d453cb01c3..7d5537fc2a 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 @@ package android.hardware.radio.modem; @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 a2df30ddfa..96fb5a8974 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 @@ package android.hardware.radio.modem; /* @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 104cb40ddc..bafcd19d9c 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 @@ -35,6 +35,10 @@ package android.hardware.radio.modem; /* @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. */ 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 d9ecf65e17..c94124680e 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 @@ -38,7 +38,7 @@ parcelable NvWriteItem { /** * @deprecated NV APIs are deprecated starting from Android U. */ - android.hardware.radio.modem.NvItem itemId; + android.hardware.radio.modem.NvItem itemId = android.hardware.radio.modem.NvItem.INVALID; /** * @deprecated NV APIs are deprecated starting from Android U. */ 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 b4208b7754..e9937f068c 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 7ca4021bf8..6ad47fc893 100644 --- a/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl +++ b/radio/aidl/android/hardware/radio/modem/ActivityStatsTechSpecificInfo.aidl @@ -36,7 +36,7 @@ parcelable ActivityStatsTechSpecificInfo { * 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 c1f4cd6b53..86df92005d 100644 --- a/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl +++ b/radio/aidl/android/hardware/radio/modem/DeviceStateType.aidl @@ -20,6 +20,7 @@ package android.hardware.radio.modem; @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 1ba3562e62..4818c9eac5 100644 --- a/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl +++ b/radio/aidl/android/hardware/radio/modem/HardwareConfigModem.aidl @@ -34,7 +34,7 @@ parcelable HardwareConfigModem { /** * 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 6d33505233..82fade5d87 100644 --- a/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl +++ b/radio/aidl/android/hardware/radio/modem/ImeiInfo.aidl @@ -29,6 +29,8 @@ parcelable ImeiInfo { * 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 @@ parcelable ImeiInfo { } /** 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 a62624eee8..d646ff7da2 100644 --- a/radio/aidl/android/hardware/radio/modem/NvItem.aidl +++ b/radio/aidl/android/hardware/radio/modem/NvItem.aidl @@ -23,6 +23,10 @@ package android.hardware.radio.modem; @Backing(type="int") @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) diff --git a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl index 1c6c11ea52..482126a0ff 100644 --- a/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl +++ b/radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl @@ -27,7 +27,7 @@ parcelable NvWriteItem { /** * @deprecated NV APIs are deprecated starting from Android U. */ - NvItem itemId; + NvItem itemId = NvItem.INVALID; /** * @deprecated NV APIs are deprecated starting from Android U. */ diff --git a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl index e290a52635..b6be54dee0 100644 --- a/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl +++ b/radio/aidl/android/hardware/radio/modem/ResetNvType.aidl @@ -23,6 +23,7 @@ package android.hardware.radio.modem; @VintfStability @Backing(type="int") @JavaDerive(toString=true) +@SuppressWarnings(value={"redundant-name"}) enum ResetNvType { /** * Reload all NV items