From e7395027cf2586388eb1e051a75ae046aa0ef742 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Mon, 20 Jun 2016 09:27:12 -0700 Subject: [PATCH] [NAN] Add transport type for NAN. [DO NOT MERGE] Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data connectivity request. While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different protocol and constitutes a different transport. (cherry-pick of commit 7473bc20ad8eb5396b26bebf3a5b651b1ae50018) Bug: 26564277 Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75 --- core/java/android/net/NetworkCapabilities.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 6243f46701..ebb9601a75 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -405,8 +405,15 @@ public final class NetworkCapabilities implements Parcelable { */ public static final int TRANSPORT_VPN = 4; + /** + * Indicates this network uses a Wi-Fi NAN transport. + * + * @hide PROPOSED_NAN_API + */ + public static final int TRANSPORT_WIFI_NAN = 5; + private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; - private static final int MAX_TRANSPORT = TRANSPORT_VPN; + private static final int MAX_TRANSPORT = TRANSPORT_WIFI_NAN; /** * Adds the given transport type to this {@code NetworkCapability} instance. @@ -862,6 +869,7 @@ public final class NetworkCapabilities implements Parcelable { case TRANSPORT_BLUETOOTH: transports += "BLUETOOTH"; break; case TRANSPORT_ETHERNET: transports += "ETHERNET"; break; case TRANSPORT_VPN: transports += "VPN"; break; + case TRANSPORT_WIFI_NAN: transports += "WIFI_NAN"; break; } if (++i < types.length) transports += "|"; }