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

Commit 081977e4 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of e139167c to master"

parents 007fc721 8a024011

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17818,6 +17818,7 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_GPRS = 1; // 0x1

    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_LTE = 13; // 0xd

core/java/android/net/ConnectivityManager.java

+7 −9
Original line number Diff line number Diff line
@@ -164,14 +164,12 @@ public class ConnectivityManager { 


    /**

     * The Default Mobile data connection.  When active, all data traffic

     * will use this connection by default.  Should not coexist with other

     * default connections.

     * will use this connection by default.

     */

    public static final int TYPE_MOBILE      = 0;

    /**

     * The Default WIFI data connection.  When active, all data traffic

     * will use this connection by default.  Should not coexist with other

     * default connections.

     * will use this connection by default.

     */

    public static final int TYPE_WIFI        = 1;

    /**
@@ -207,13 +205,13 @@ public class ConnectivityManager { 
    public static final int TYPE_MOBILE_HIPRI = 5;

    /**

     * The Default WiMAX data connection.  When active, all data traffic

     * will use this connection by default.  Should not coexist with other

     * default connections.

     * will use this connection by default.

     */

    public static final int TYPE_WIMAX       = 6;



    /**

     * Bluetooth data connection. This is used for Bluetooth reverse tethering.

     * The Default Bluetooth data connection. When active, all data traffic

     * will use this connection by default.

     */

    public static final int TYPE_BLUETOOTH   = 7;
@@ -223,8 +221,8 @@ public class ConnectivityManager { 
    public static final int TYPE_DUMMY       = 8;



    /**

     * Ethernet data connection.  This may be via USB dongle or more

     * traditional means.

     * The Default Ethernet data connection.  When active, all data traffic

     * will use this connection by default.

     */

    public static final int TYPE_ETHERNET    = 9;

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -426,8 +426,7 @@ public class TelephonyManager { 
    public static final int NETWORK_TYPE_LTE = 13;

    /** Current network is eHRPD */

    public static final int NETWORK_TYPE_EHRPD = 14;

    /** Current network is HSPA+

     * @hide */

    /** Current network is HSPA+ */

    public static final int NETWORK_TYPE_HSPAP = 15;



    /**
@@ -450,6 +449,7 @@ public class TelephonyManager { 
     * @see #NETWORK_TYPE_IDEN

     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_HSPAP

     */

    public int getNetworkType() {

        try{
@@ -551,6 +551,8 @@ public class TelephonyManager { 
                return "CDMA - eHRPD";

            case NETWORK_TYPE_IDEN:

                return "iDEN";

            case NETWORK_TYPE_HSPAP:

                return "HSPA+";

            default:

                return "UNKNOWN";

        }