Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"

This commit is contained in:
Treehugger Robot
2017-07-18 23:09:58 +00:00
committed by Gerrit Code Review
4 changed files with 3 additions and 1 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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;