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

Commit 6659fdba authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master 

am: 6ab950dd

Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
parents 2633524c 6ab950dd

core/java/android/net/NetworkCapabilities.java

+9 −2
Original line number Diff line number Diff line
@@ -419,10 +419,16 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public static final int TRANSPORT_WIFI_AWARE = 5;



    /**

     * Indicates this network uses a LoWPAN transport.

     * @hide

     */

    public static final int TRANSPORT_LOWPAN = 6;



    /** @hide */

    public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;

    /** @hide */

    public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;

    public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN;



    /** @hide */

    public static boolean isValidTransport(int transportType) {
@@ -435,7 +441,8 @@ public final class NetworkCapabilities implements Parcelable { 
        "BLUETOOTH",

        "ETHERNET",

        "VPN",

        "WIFI_AWARE"

        "WIFI_AWARE",

        "LOWPAN"

    };



    /**