Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b754ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6a62eea4,I599435cc into main 

* changes:
  Fix AIDL warnings in Radio HAL
  Move deprecated annotation from structs to their fields
parents d60f7543 ed43421b

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+2 −1
Original line number Diff line number Diff line
@@ -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,

  }

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

+128 −4
Original line number Diff line number Diff line
@@ -32,51 +32,175 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.



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,

  /**

 * @hide

   * @deprecated NV APIs are deprecated starting from Android U.

   */

@Backing(type="int") @JavaDerive(toString=true) @VintfStability

enum NvItem {

  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,

}