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

Commit af11a49d authored by The Android Automerger's avatar The Android Automerger
Browse files

Manually merge commit '530b93aa' 

* commit '530b93aa':
  NetworkCapabilities: Unhide TRANSPORT_LOWPAN

BUG:31038431
parents d480015b 530b93aa

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25696,6 +25696,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
@@ -27990,6 +27990,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
@@ -25807,6 +25807,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;