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

Commit a073a526 authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge \\"Unhide Network types in TelephonyManager\\" into nyc-mr1-dev am: 0df9721a 

am: ac9cfbf5

Change-Id: I68771c36a436f6ccaaacc959604c6e416af8ee96
parents 677312ed ac9cfbf5

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -37480,12 +37480,15 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6

    field public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc

    field public static final int NETWORK_TYPE_GPRS = 1; // 0x1

    field public static final int NETWORK_TYPE_GSM = 16; // 0x10

    field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8

    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 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_TD_SCDMA = 17; // 0x11

    field public static final int NETWORK_TYPE_UMTS = 3; // 0x3

    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

    field public static final int PHONE_TYPE_CDMA = 2; // 0x2

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -40567,12 +40567,15 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6

    field public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc

    field public static final int NETWORK_TYPE_GPRS = 1; // 0x1

    field public static final int NETWORK_TYPE_GSM = 16; // 0x10

    field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8

    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 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_TD_SCDMA = 17; // 0x11

    field public static final int NETWORK_TYPE_UMTS = 3; // 0x3

    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

    field public static final int PHONE_TYPE_CDMA = 2; // 0x2

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -37558,12 +37558,15 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_EVDO_A = 6; // 0x6

    field public static final int NETWORK_TYPE_EVDO_B = 12; // 0xc

    field public static final int NETWORK_TYPE_GPRS = 1; // 0x1

    field public static final int NETWORK_TYPE_GSM = 16; // 0x10

    field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8

    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 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_TD_SCDMA = 17; // 0x11

    field public static final int NETWORK_TYPE_UMTS = 3; // 0x3

    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

    field public static final int PHONE_TYPE_CDMA = 2; // 0x2

telephony/java/android/telephony/TelephonyManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1445,11 +1445,11 @@ public class TelephonyManager { 
    public static final int NETWORK_TYPE_EHRPD = 14;

    /** Current network is HSPA+ */

    public static final int NETWORK_TYPE_HSPAP = 15;

    /** Current network is GSM {@hide} */

    /** Current network is GSM */

    public static final int NETWORK_TYPE_GSM = 16;

     /** Current network is TD_SCDMA {@hide} */

    /** Current network is TD_SCDMA */

    public static final int NETWORK_TYPE_TD_SCDMA = 17;

   /** Current network is IWLAN {@hide} */

    /** Current network is IWLAN */

    public static final int NETWORK_TYPE_IWLAN = 18;



    /**