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

Commit bc7038f9 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

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
parent 8925adb1

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.modem;

package android.hardware.radio.modem;

/* @hide */

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

enum NvItem {

  /**

  /**

 * @hide

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

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

   */

   */

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

enum NvItem {

  CDMA_MEID = 1,

  CDMA_MEID = 1,

  /**

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

   */

  CDMA_MIN = 2,

  CDMA_MIN = 2,

  /**

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

   */

  CDMA_MDN = 3,

  CDMA_MDN = 3,

  /**

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

   */

  CDMA_ACCOLC = 4,

  CDMA_ACCOLC = 4,

  /**

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

   */

  DEVICE_MSL = 11,

  DEVICE_MSL = 11,

  /**

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

   */

  RTN_RECONDITIONED_STATUS = 12,

  RTN_RECONDITIONED_STATUS = 12,

  /**

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

   */

  RTN_ACTIVATION_DATE = 13,

  RTN_ACTIVATION_DATE = 13,

  /**

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

   */

  RTN_LIFE_TIMER = 14,

  RTN_LIFE_TIMER = 14,

  /**

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

   */

  RTN_LIFE_CALLS = 15,

  RTN_LIFE_CALLS = 15,

  /**

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

   */

  RTN_LIFE_DATA_TX = 16,

  RTN_LIFE_DATA_TX = 16,

  /**

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

   */

  RTN_LIFE_DATA_RX = 17,

  RTN_LIFE_DATA_RX = 17,

  /**

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

   */

  OMADM_HFA_LEVEL = 18,

  OMADM_HFA_LEVEL = 18,

  /**

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

   */

  MIP_PROFILE_NAI = 31,

  MIP_PROFILE_NAI = 31,

  /**

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

   */

  MIP_PROFILE_HOME_ADDRESS = 32,

  MIP_PROFILE_HOME_ADDRESS = 32,

  /**

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

   */

  MIP_PROFILE_AAA_AUTH = 33,

  MIP_PROFILE_AAA_AUTH = 33,

  /**

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

   */

  MIP_PROFILE_HA_AUTH = 34,

  MIP_PROFILE_HA_AUTH = 34,

  /**

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

   */

  MIP_PROFILE_PRI_HA_ADDR = 35,

  MIP_PROFILE_PRI_HA_ADDR = 35,

  /**

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

   */

  MIP_PROFILE_SEC_HA_ADDR = 36,

  MIP_PROFILE_SEC_HA_ADDR = 36,

  /**

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

   */

  MIP_PROFILE_REV_TUN_PREF = 37,

  MIP_PROFILE_REV_TUN_PREF = 37,

  /**

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

   */

  MIP_PROFILE_HA_SPI = 38,

  MIP_PROFILE_HA_SPI = 38,

  /**

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

   */

  MIP_PROFILE_AAA_SPI = 39,

  MIP_PROFILE_AAA_SPI = 39,

  /**

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

   */

  MIP_PROFILE_MN_HA_SS = 40,

  MIP_PROFILE_MN_HA_SS = 40,

  /**

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

   */

  MIP_PROFILE_MN_AAA_SS = 41,

  MIP_PROFILE_MN_AAA_SS = 41,

  /**

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

   */

  CDMA_PRL_VERSION = 51,

  CDMA_PRL_VERSION = 51,

  /**

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

   */

  CDMA_BC10 = 52,

  CDMA_BC10 = 52,

  /**

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

   */

  CDMA_BC14 = 53,

  CDMA_BC14 = 53,

  /**

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

   */

  CDMA_SO68 = 54,

  CDMA_SO68 = 54,

  /**

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

   */

  CDMA_SO73_COP0 = 55,

  CDMA_SO73_COP0 = 55,

  /**

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

   */

  CDMA_SO73_COP1TO7 = 56,

  CDMA_SO73_COP1TO7 = 56,

  /**

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

   */

  CDMA_1X_ADVANCED_ENABLED = 57,

  CDMA_1X_ADVANCED_ENABLED = 57,

  /**

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

   */

  CDMA_EHRPD_ENABLED = 58,

  CDMA_EHRPD_ENABLED = 58,

  /**

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

   */

  CDMA_EHRPD_FORCED = 59,

  CDMA_EHRPD_FORCED = 59,

  /**

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

   */

  LTE_BAND_ENABLE_25 = 71,

  LTE_BAND_ENABLE_25 = 71,

  /**

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

   */

  LTE_BAND_ENABLE_26 = 72,

  LTE_BAND_ENABLE_26 = 72,

  /**

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

   */

  LTE_BAND_ENABLE_41 = 73,

  LTE_BAND_ENABLE_41 = 73,

  /**

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

   */

  LTE_SCAN_PRIORITY_25 = 74,

  LTE_SCAN_PRIORITY_25 = 74,

  /**

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

   */

  LTE_SCAN_PRIORITY_26 = 75,

  LTE_SCAN_PRIORITY_26 = 75,

  /**

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

   */

  LTE_SCAN_PRIORITY_41 = 76,

  LTE_SCAN_PRIORITY_41 = 76,

  /**

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

   */

  LTE_HIDDEN_BAND_PRIORITY_25 = 77,

  LTE_HIDDEN_BAND_PRIORITY_25 = 77,

  /**

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

   */

  LTE_HIDDEN_BAND_PRIORITY_26 = 78,

  LTE_HIDDEN_BAND_PRIORITY_26 = 78,

  /**

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

   */

  LTE_HIDDEN_BAND_PRIORITY_41 = 79,

  LTE_HIDDEN_BAND_PRIORITY_41 = 79,

}
 
}

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

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

// later when a module using the interface is updated, e.g., Mainline modules.





package android.hardware.radio.modem;

package android.hardware.radio.modem;

/* @hide */

@JavaDerive(toString=true) @VintfStability

parcelable NvWriteItem {

  /**

  /**

 * @hide

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

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

   */

   */

@JavaDerive(toString=true) @VintfStability

parcelable NvWriteItem {

  android.hardware.radio.modem.NvItem itemId;

  android.hardware.radio.modem.NvItem itemId;

  /**

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

   */

  String value;

  String value;

}
 
}

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

+41 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.hardware.radio.modem;

package android.hardware.radio.modem;





/**

/**

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

 * @hide

 * @hide

 */

 */

@VintfStability

@VintfStability
@@ -27,170 +26,211 @@ enum NvItem { 
    /**

    /**

     * CDMA radio and account information (items 1-10)

     * CDMA radio and account information (items 1-10)

     * CDMA MEID (hex)

     * CDMA MEID (hex)

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

     */

     */

    CDMA_MEID = 1,

    CDMA_MEID = 1,

    /**

    /**

     * CDMA MIN (MSID)

     * CDMA MIN (MSID)

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

     */

     */

    CDMA_MIN = 2,

    CDMA_MIN = 2,

    /**

    /**

     * CDMA MDN

     * CDMA MDN

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

     */

     */

    CDMA_MDN = 3,

    CDMA_MDN = 3,

    /**

    /**

     * CDMA access overload control

     * CDMA access overload control

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

     */

     */

    CDMA_ACCOLC = 4,

    CDMA_ACCOLC = 4,

    /**

    /**

     * Carrier device provisioning (items 11-30)

     * Carrier device provisioning (items 11-30)

     * Device MSL

     * Device MSL

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

     */

     */

    DEVICE_MSL = 11,

    DEVICE_MSL = 11,

    /**

    /**

     * RTN reconditioned status

     * RTN reconditioned status

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

     */

     */

    RTN_RECONDITIONED_STATUS = 12,

    RTN_RECONDITIONED_STATUS = 12,

    /**

    /**

     * RTN activation date

     * RTN activation date

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

     */

     */

    RTN_ACTIVATION_DATE = 13,

    RTN_ACTIVATION_DATE = 13,

    /**

    /**

     * RTN life timer

     * RTN life timer

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

     */

     */

    RTN_LIFE_TIMER = 14,

    RTN_LIFE_TIMER = 14,

    /**

    /**

     * RTN life calls

     * RTN life calls

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

     */

     */

    RTN_LIFE_CALLS = 15,

    RTN_LIFE_CALLS = 15,

    /**

    /**

     * RTN life data TX

     * RTN life data TX

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

     */

     */

    RTN_LIFE_DATA_TX = 16,

    RTN_LIFE_DATA_TX = 16,

    /**

    /**

     * RTN life data RX

     * RTN life data RX

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

     */

     */

    RTN_LIFE_DATA_RX = 17,

    RTN_LIFE_DATA_RX = 17,

    /**

    /**

     * HFA in progress

     * HFA in progress

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

     */

     */

    OMADM_HFA_LEVEL = 18,

    OMADM_HFA_LEVEL = 18,

    /**

    /**

     * Mobile IP profile information (items 31-50)

     * Mobile IP profile information (items 31-50)

     * NAI realm

     * NAI realm

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

     */

     */

    MIP_PROFILE_NAI = 31,

    MIP_PROFILE_NAI = 31,

    /**

    /**

     * MIP home address

     * MIP home address

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

     */

     */

    MIP_PROFILE_HOME_ADDRESS = 32,

    MIP_PROFILE_HOME_ADDRESS = 32,

    /**

    /**

     * AAA auth

     * AAA auth

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

     */

     */

    MIP_PROFILE_AAA_AUTH = 33,

    MIP_PROFILE_AAA_AUTH = 33,

    /**

    /**

     * HA auth

     * HA auth

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

     */

     */

    MIP_PROFILE_HA_AUTH = 34,

    MIP_PROFILE_HA_AUTH = 34,

    /**

    /**

     * Primary HA address

     * Primary HA address

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

     */

     */

    MIP_PROFILE_PRI_HA_ADDR = 35,

    MIP_PROFILE_PRI_HA_ADDR = 35,

    /**

    /**

     * Secondary HA address

     * Secondary HA address

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

     */

     */

    MIP_PROFILE_SEC_HA_ADDR = 36,

    MIP_PROFILE_SEC_HA_ADDR = 36,

    /**

    /**

     * Reverse TUN preference

     * Reverse TUN preference

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

     */

     */

    MIP_PROFILE_REV_TUN_PREF = 37,

    MIP_PROFILE_REV_TUN_PREF = 37,

    /**

    /**

     * HA SPI

     * HA SPI

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

     */

     */

    MIP_PROFILE_HA_SPI = 38,

    MIP_PROFILE_HA_SPI = 38,

    /**

    /**

     * AAA SPI

     * AAA SPI

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

     */

     */

    MIP_PROFILE_AAA_SPI = 39,

    MIP_PROFILE_AAA_SPI = 39,

    /**

    /**

     * HA shared secret

     * HA shared secret

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

     */

     */

    MIP_PROFILE_MN_HA_SS = 40,

    MIP_PROFILE_MN_HA_SS = 40,

    /**

    /**

     * AAA shared secret

     * AAA shared secret

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

     */

     */

    MIP_PROFILE_MN_AAA_SS = 41,

    MIP_PROFILE_MN_AAA_SS = 41,

    /**

    /**

     * CDMA network and band config (items 51-70)

     * CDMA network and band config (items 51-70)

     * CDMA PRL version

     * CDMA PRL version

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

     */

     */

    CDMA_PRL_VERSION = 51,

    CDMA_PRL_VERSION = 51,

    /**

    /**

     * CDMA band class 10

     * CDMA band class 10

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

     */

     */

    CDMA_BC10 = 52,

    CDMA_BC10 = 52,

    /**

    /**

     * CDMA band class 14

     * CDMA band class 14

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

     */

     */

    CDMA_BC14 = 53,

    CDMA_BC14 = 53,

    /**

    /**

     * CDMA SO68

     * CDMA SO68

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

     */

     */

    CDMA_SO68 = 54,

    CDMA_SO68 = 54,

    /**

    /**

     * CDMA SO73 COP0

     * CDMA SO73 COP0

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

     */

     */

    CDMA_SO73_COP0 = 55,

    CDMA_SO73_COP0 = 55,

    /**

    /**

     * CDMA SO73 COP1-7

     * CDMA SO73 COP1-7

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

     */

     */

    CDMA_SO73_COP1TO7 = 56,

    CDMA_SO73_COP1TO7 = 56,

    /**

    /**

     * CDMA 1X Advanced enabled

     * CDMA 1X Advanced enabled

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

     */

     */

    CDMA_1X_ADVANCED_ENABLED = 57,

    CDMA_1X_ADVANCED_ENABLED = 57,

    /**

    /**

     * CDMA eHRPD enabled

     * CDMA eHRPD enabled

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

     */

     */

    CDMA_EHRPD_ENABLED = 58,

    CDMA_EHRPD_ENABLED = 58,

    /**

    /**

     * CDMA eHRPD forced

     * CDMA eHRPD forced

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

     */

     */

    CDMA_EHRPD_FORCED = 59,

    CDMA_EHRPD_FORCED = 59,

    /**

    /**

     * LTE network and band config (items 71-90)

     * LTE network and band config (items 71-90)

     * LTE band 25 enabled

     * LTE band 25 enabled

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

     */

     */

    LTE_BAND_ENABLE_25 = 71,

    LTE_BAND_ENABLE_25 = 71,

    /**

    /**

     * LTE band 26 enabled

     * LTE band 26 enabled

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

     */

     */

    LTE_BAND_ENABLE_26 = 72,

    LTE_BAND_ENABLE_26 = 72,

    /**

    /**

     * LTE band 41 enabled

     * LTE band 41 enabled

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

     */

     */

    LTE_BAND_ENABLE_41 = 73,

    LTE_BAND_ENABLE_41 = 73,

    /**

    /**

     * LTE band 25 scan priority

     * LTE band 25 scan priority

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

     */

     */

    LTE_SCAN_PRIORITY_25 = 74,

    LTE_SCAN_PRIORITY_25 = 74,

    /**

    /**

     * LTE band 26 scan priority

     * LTE band 26 scan priority

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

     */

     */

    LTE_SCAN_PRIORITY_26 = 75,

    LTE_SCAN_PRIORITY_26 = 75,

    /**

    /**

     * LTE band 41 scan priority

     * LTE band 41 scan priority

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

     */

     */

    LTE_SCAN_PRIORITY_41 = 76,

    LTE_SCAN_PRIORITY_41 = 76,

    /**

    /**

     * LTE hidden band 25 priority

     * LTE hidden band 25 priority

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

     */

     */

    LTE_HIDDEN_BAND_PRIORITY_25 = 77,

    LTE_HIDDEN_BAND_PRIORITY_25 = 77,

    /**

    /**

     * LTE hidden band 26 priority

     * LTE hidden band 26 priority

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

     */

     */

    LTE_HIDDEN_BAND_PRIORITY_26 = 78,

    LTE_HIDDEN_BAND_PRIORITY_26 = 78,

    /**

    /**

     * LTE hidden band 41 priority

     * LTE hidden band 41 priority

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

     */

     */

    LTE_HIDDEN_BAND_PRIORITY_41 = 79,

    LTE_HIDDEN_BAND_PRIORITY_41 = 79,

}
 
}

radio/aidl/android/hardware/radio/modem/NvWriteItem.aidl

+6 −1
Original line number Original line Diff line number Diff line
@@ -19,12 +19,17 @@ package android.hardware.radio.modem; 
import android.hardware.radio.modem.NvItem;

import android.hardware.radio.modem.NvItem;





/**

/**

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

 * @hide

 * @hide

 */

 */

@VintfStability

@VintfStability

@JavaDerive(toString=true)

@JavaDerive(toString=true)

parcelable NvWriteItem {

parcelable NvWriteItem {

    /**

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

     */

    NvItem itemId;

    NvItem itemId;

    /**

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

     */

    String value;

    String value;

}
 
}