Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"

Browse Source 
am: 777c408a22

Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
This commit is contained in:
Robert Quattlebaum
2017-07-18 23:33:08 +00:00
committed by android-build-merger
parent 8e82bc9961 777c408a22
commit 6b0e6946c3
4 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -25588,6 +25588,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

1
api/system-current.txt
View File

@@ -27784,6 +27784,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

1
api/test-current.txt
View File

@@ -25697,6 +25697,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

1
core/java/android/net/NetworkCapabilities.java
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;