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

Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master

Browse Source 
am: 6ab950dd5f

Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
This commit is contained in:
Hugo Benichi
2017-07-11 10:15:19 +00:00
committed by android-build-merger
parent 2633524cd5 6ab950dd5f
commit 6659fdba55
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,10 +419,16 @@ public final class NetworkCapabilities implements Parcelable {
*/
public static final int TRANSPORT_WIFI_AWARE = 5;
/**
* 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_WIFI_AWARE;
public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN;
/** @hide */
public static boolean isValidTransport(int transportType) {
@@ -435,7 +441,8 @@ public final class NetworkCapabilities implements Parcelable {
"BLUETOOTH",
"ETHERNET",
"VPN",
"WIFI_AWARE"
"WIFI_AWARE",
"LOWPAN"
};
/**