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

Commit 2da6bafe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate iDen network type"

parents c6d79d23 3867718a

core/api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -44057,7 +44057,6 @@ package android.telephony { 
    field public static final long NETWORK_TYPE_BITMASK_HSPA = 512L; // 0x200L

    field public static final long NETWORK_TYPE_BITMASK_HSPAP = 16384L; // 0x4000L

    field public static final long NETWORK_TYPE_BITMASK_HSUPA = 256L; // 0x100L

    field public static final long NETWORK_TYPE_BITMASK_IDEN = 1024L; // 0x400L

    field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L

    field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L

    field @Deprecated public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L
@@ -44077,7 +44076,7 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_HSPA = 10; // 0xa

    field public static final int NETWORK_TYPE_HSPAP = 15; // 0xf

    field public static final int NETWORK_TYPE_HSUPA = 9; // 0x9

    field public static final int NETWORK_TYPE_IDEN = 11; // 0xb

    field @Deprecated public static final int NETWORK_TYPE_IDEN = 11; // 0xb

    field public static final int NETWORK_TYPE_IWLAN = 18; // 0x12

    field public static final int NETWORK_TYPE_LTE = 13; // 0xd

    field public static final int NETWORK_TYPE_NR = 20; // 0x14

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Diff line number Diff line
@@ -2975,7 +2975,11 @@ public class TelephonyManager { 
    public static final int NETWORK_TYPE_HSUPA = TelephonyProtoEnums.NETWORK_TYPE_HSUPA; // = 9.

    /** Current network is HSPA */

    public static final int NETWORK_TYPE_HSPA = TelephonyProtoEnums.NETWORK_TYPE_HSPA; // = 10.

    /** Current network is iDen */

    /**

     * Current network is iDen

     * @deprecated Legacy network type no longer being used.

     */

    @Deprecated

    public static final int NETWORK_TYPE_IDEN = TelephonyProtoEnums.NETWORK_TYPE_IDEN; // = 11.

    /** Current network is EVDO revision B*/

    public static final int NETWORK_TYPE_EVDO_B = TelephonyProtoEnums.NETWORK_TYPE_EVDO_B; // = 12.
@@ -13983,6 +13987,7 @@ public class TelephonyManager { 
    public static final long NETWORK_TYPE_BITMASK_HSPA = (1 << (NETWORK_TYPE_HSPA -1));

    /**

     * network type bitmask indicating the support of radio tech iDen.

     * @hide

     */

    public static final long NETWORK_TYPE_BITMASK_IDEN = (1 << (NETWORK_TYPE_IDEN - 1));

    /**