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

Commit 97ab2d4f authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Reveal some network constants. 

Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
parent 4686fb8a

api/current.xml

+34 −1
Original line number Diff line number Diff line
@@ -114329,6 +114329,28 @@ 
 visibility="public"

>

</field>

<field name="TYPE_BLUETOOTH"

 type="int"

 transient="false"

 volatile="false"

 value="7"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TYPE_ETHERNET"

 type="int"

 transient="false"

 volatile="false"

 value="9"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TYPE_MOBILE"

 type="int"

 transient="false"
@@ -184343,6 +184365,17 @@ 
 visibility="public"

>

</field>

<field name="NETWORK_TYPE_HSPAP"

 type="int"

 transient="false"

 volatile="false"

 value="15"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="NETWORK_TYPE_HSUPA"

 type="int"

 transient="false"
@@ -221191,7 +221224,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="ev" type="android.view.MotionEvent">

<parameter name="event" type="android.view.MotionEvent">

</parameter>

</method>

<method name="clear"

core/java/android/net/ConnectivityManager.java

+9 −9
Original line number Diff line number Diff line
@@ -165,14 +165,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;

    /**
@@ -208,20 +206,22 @@ 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.

     * @hide

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

     * will use this connection by default.

     */

    public static final int TYPE_BLUETOOTH   = 7;



    /** {@hide} */

    public static final int TYPE_DUMMY       = 8;

    /** {@hide} */

    /**

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

     * will use this connection by default.

     */

    public static final int TYPE_ETHERNET    = 9;

    /** {@hide} TODO: Need to adjust this for WiMAX. */

    public static final int MAX_RADIO_TYPE   = TYPE_ETHERNET;

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -427,8 +427,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;



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

     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_HSPAP

     */

    public int getNetworkType() {

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

            case NETWORK_TYPE_IDEN:

                return "iDEN";

            case NETWORK_TYPE_HSPAP:

                return "HSPA+";

            default:

                return "UNKNOWN";

        }