commit 305ea28a43fbd441ba84e66aca135a002e37ccfb
author Etan Cohen <etancohen@google.com> Mon Jun 20 09:27:12 2016 -0700
committer Etan Cohen <etancohen@google.com> Fri Sep 16 10:21:51 2016 -0700
tree 9b62fa004d3ffdb3ccaf8b153fe79f3c7aaba95c
parent 21ba3d9527348a73c7cfc3b66a6d98a4a5b8085f

[NAN] Add transport type for NAN.

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 7b84987a6acf2f0a950c334a17a6ee085db3ba4f)
(cherry-pick of commit bd9fdbe02275f51c1e24a451aecd40038c4a20e1)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 6243f46..ebb9601 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -405,8 +405,15 @@
      */
     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 @@
                 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 += "|";
         }