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

Merge changes I193297e0,I43beb966

Browse Source 
am: c729ff8253

Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
This commit is contained in:
Hugo Benichi
2017-06-24 00:13:24 +00:00
committed by android-build-merger
parent 6dfb0ca3d5 c729ff8253
commit 5dec1df23b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/NetworkCapabilities.java
View File

@@ -418,8 +418,16 @@ public final class NetworkCapabilities implements Parcelable {
*/
public static final int TRANSPORT_WIFI_AWARE = 5;
private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;
/**
* 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_LOWPAN;
private static final String[] TRANSPORT_NAMES = {
"CELLULAR",
@@ -427,7 +435,8 @@ public final class NetworkCapabilities implements Parcelable {
"BLUETOOTH",
"ETHERNET",
"VPN",
"WIFI_AWARE"
"WIFI_AWARE",
"LOWPAN"
};
/**