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

Commit 777c408a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"

parents f126c41d d95f73c3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24009,6 +24009,7 @@ package android.net { 
    field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2

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

    field public static final int TRANSPORT_ETHERNET = 3; // 0x3

    field public static final int TRANSPORT_LOWPAN = 6; // 0x6

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

    field public static final int TRANSPORT_WIFI = 1; // 0x1

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25847,6 +25847,7 @@ package android.net { 
    field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2

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

    field public static final int TRANSPORT_ETHERNET = 3; // 0x3

    field public static final int TRANSPORT_LOWPAN = 6; // 0x6

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

    field public static final int TRANSPORT_WIFI = 1; // 0x1

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24083,6 +24083,7 @@ package android.net { 
    field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2

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

    field public static final int TRANSPORT_ETHERNET = 3; // 0x3

    field public static final int TRANSPORT_LOWPAN = 6; // 0x6

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

    field public static final int TRANSPORT_WIFI = 1; // 0x1

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

core/java/android/net/NetworkCapabilities.java

+0 −1
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ public final class NetworkCapabilities implements Parcelable { 


    /**

     * Indicates this network uses a LoWPAN transport.

     * @hide

     */

    public static final int TRANSPORT_LOWPAN = 6;