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

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

Merge "Expose more net types to the public."

parents 1a2210ce 6081084e

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -10778,6 +10778,9 @@ package android.net { 
    field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";

    field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";

    field public static final java.lang.String EXTRA_REASON = "reason";

    field public static final int TYPE_BLUETOOTH = 7; // 0x7

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

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

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

    field public static final int TYPE_MOBILE_DUN = 4; // 0x4

    field public static final int TYPE_MOBILE_HIPRI = 5; // 0x5

core/java/android/net/ConnectivityManager.java

+8 −3
Original line number Diff line number Diff line
@@ -215,15 +215,20 @@ public class ConnectivityManager 


    /**

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

     * @hide

     */

    public static final int TYPE_BLUETOOTH   = 7;



    /** {@hide} */

    /**

     * Dummy data connection.  This should not be used on shipping devices.

     */

    public static final int TYPE_DUMMY       = 8;



    /** {@hide} */

    /**

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

     * traditional means.

     */

    public static final int TYPE_ETHERNET    = 9;



    /**

     * Over the air Adminstration.

     * {@hide}