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

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

Merge "Add some network types that OEM's are asking for." into gingerbread

parents 5f2def8c e12aec94

core/java/android/net/ConnectivityManager.java

+9 −0
Original line number Diff line number Diff line
@@ -209,6 +209,15 @@ public class ConnectivityManager 
     * default connections.

     */

    public static final int TYPE_WIMAX       = 6;

    /**

     * Bluetooth data connection.

     * @hide

     */

    public static final int TYPE_BLUETOOTH   = 7;

    /** {@hide} */

    public static final int TYPE_DUMMY       = 8;

    /** {@hide} */

    public static final int TYPE_ETHERNET    = 9;

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

    public static final int MAX_RADIO_TYPE   = TYPE_WIFI;

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

telephony/java/android/telephony/TelephonyManager.java

+4 −1
Original line number Diff line number Diff line
@@ -393,7 +393,10 @@ public class TelephonyManager { 
    public static final int NETWORK_TYPE_IDEN = 11;

    /** Current network is EVDO revision B*/

    public static final int NETWORK_TYPE_EVDO_B = 12;



    /** @hide */

    public static final int NETWORK_TYPE_LTE = 13;

    /** @hide */

    public static final int NETWORK_TYPE_EHRPD = 14;



    /**

     * Returns a constant indicating the radio technology (network type)