From e72f7dc385bf0d8ae2c5015aaa7de74b5ef769eb Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew@google.com>
Date: Tue, 1 Nov 2016 13:03:35 -0700
Subject: [PATCH 1/2] Add constants for 802.11r

Add constants FT-EAP and FT-PSK, which implement 802.11r Fast
BSS Transition.

Bug: 32607043
Change-Id: Ic089bf9331723f1fce3978253437f5759c6d61e9
Test: Build (constants only)
---
 wifi/java/android/net/wifi/WifiConfiguration.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 24cd275fc2541..e28485464a003 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -98,10 +98,22 @@ public class WifiConfiguration implements Parcelable {
          */
         public static final int OSEN = 5;
 
+        /**
+         * IEEE 802.11r Fast BSS Transition with PSK authentication.
+         * @hide
+         */
+        public static final int FT_PSK = 6;
+
+        /**
+         * IEEE 802.11r Fast BSS Transition with EAP authentication.
+         * @hide
+         */
+        public static final int FT_EAP = 7;
+
         public static final String varName = "key_mgmt";
 
         public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP", "IEEE8021X",
-                "WPA2_PSK", "OSEN" };
+                "WPA2_PSK", "OSEN", "FT_PSK", "FT_EAP" };
     }
 
     /**

From 07f4d23a884e518904a5b04e2e107fb562cf894d Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew@google.com>
Date: Wed, 2 Nov 2016 11:11:52 -0700
Subject: [PATCH 2/2] Add capability flag for 802.11r fast BSS transition

Not only isn't there a way to query this capability from the
driver, but there may be valid reasons to disable this feature
per-platform.

Bug: 32607043
Change-Id: Iea23e430efc61ffe0f6b68502c89a14bdcd318bb
Test: Compile
---
 core/res/res/values/config.xml  | 3 +++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index a8be8d34e19a8..05aadcfc6aedb 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -407,6 +407,9 @@
     <!-- Boolean indicating whether Hotspot 2.0/Passpoint and ANQP queries is enabled -->
     <bool translatable="false" name="config_wifi_hotspot2_enabled">false</bool>
 
+    <!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
+    <bool translatable="false" name="config_wifi_fast_bss_transition_enabled">false</bool>
+
     <!-- Device type information conforming to Annex B format in WiFi Direct specification.
          The default represents a dual-mode smartphone -->
     <string translatable="false" name="config_wifi_p2p_device_type">10-0050F204-5</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 6f2822bd2d98d..e37c93c803b42 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1679,6 +1679,7 @@
   <java-symbol type="bool" name="config_wifi_background_scan_support" />
   <java-symbol type="bool" name="config_wifi_dual_band_support" />
   <java-symbol type="bool" name="config_wifi_hotspot2_enabled" />
+  <java-symbol type="bool" name="config_wifi_fast_bss_transition_enabled" />
   <java-symbol type="bool" name="config_wimaxEnabled" />
   <java-symbol type="bool" name="show_ongoing_ime_switcher" />
   <java-symbol type="color" name="config_defaultNotificationColor" />