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
This commit is contained in:
Hugo Benichi
2017-07-11 10:06:03 +00:00
committed by Android (Google) Code Review
parent 76ea0eb773 eadb452d72
commit 6ab950dd5f
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; public static final int TRANSPORT_WIFI_AWARE = 5;
/**
* Indicates this network uses a LoWPAN transport.
* @hide
*/
public static final int TRANSPORT_LOWPAN = 6;
/** @hide */ /** @hide */
public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
/** @hide */ /** @hide */
public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN;
/** @hide */ /** @hide */
public static boolean isValidTransport(int transportType) { public static boolean isValidTransport(int transportType) {
@@ -435,7 +441,8 @@ public final class NetworkCapabilities implements Parcelable {
"BLUETOOTH", "BLUETOOTH",
"ETHERNET", "ETHERNET",
"VPN", "VPN",
"WIFI_AWARE" "WIFI_AWARE",
"LOWPAN"
}; };
/** /**