diff options
| author | 2017-07-11 10:15:19 +0000 | |
|---|---|---|
| committer | 2017-07-11 10:15:19 +0000 | |
| commit | 6659fdba558aa558aa80f46f72c0722d5eb130a2 (patch) | |
| tree | d0bdcb7445772372e53633beb9eeacb71d77199d | |
| parent | 2633524cd5789ccc31c0915d809c0ee835df4733 (diff) | |
| parent | 6ab950dd5fda20505aecac2dea9767cf143a4e1a (diff) | |
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
am: 6ab950dd5f
Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 400a9ad16c62..76646b8939c4 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -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" }; /** |