1 files changed, 33 insertions, 12 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 908487152..fc4c122fa 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -350,6 +350,8 @@ public class WifiConfigStore {
 
         readNetworkBitsetVariable(config.networkId, config.allowedKeyManagement,
                 WifiConfiguration.KeyMgmt.varName, WifiConfiguration.KeyMgmt.strings);
+        // The FT flags should not be exposed to external apps.
+        config.allowedKeyManagement = removeFastTransitionFlags(config.allowedKeyManagement);
 
         readNetworkBitsetVariable(config.networkId, config.allowedAuthAlgorithms,
                 WifiConfiguration.AuthAlgorithm.varName, WifiConfiguration.AuthAlgorithm.strings);
@@ -430,13 +432,6 @@ public class WifiConfigStore {
                 }
                 config.setIpAssignment(IpAssignment.DHCP);
                 config.setProxySettings(ProxySettings.NONE);
-                if (!WifiServiceImpl.isValid(config)) {
-                    if (mShowNetworks) {
-                        localLog("Ignoring network " + config.networkId + " because configuration "
-                                + "loaded from wpa_supplicant.conf is not valid.");
-                    }
-                    continue;
-                }
                 // The configKey is explicitly stored in wpa_supplicant.conf, because config does
                 // not contain sufficient information to compute it at this point.
                 String configKey = extras.get(ID_STRING_KEY_CONFIG_KEY);
@@ -610,14 +605,34 @@ public class WifiConfigStore {
         return true;
     }
 
+    private BitSet addFastTransitionFlags(BitSet keyManagementFlags) {
+        BitSet modifiedFlags = keyManagementFlags;
+        if (keyManagementFlags.get(WifiConfiguration.KeyMgmt.WPA_PSK)) {
+            modifiedFlags.set(WifiConfiguration.KeyMgmt.FT_PSK);
+        }
+        if (keyManagementFlags.get(WifiConfiguration.KeyMgmt.WPA_EAP)) {
+            modifiedFlags.set(WifiConfiguration.KeyMgmt.FT_EAP);
+        }
+        return modifiedFlags;
+    }
+
+    private BitSet removeFastTransitionFlags(BitSet keyManagementFlags) {
+        BitSet modifiedFlags = keyManagementFlags;
+        modifiedFlags.clear(WifiConfiguration.KeyMgmt.FT_PSK);
+        modifiedFlags.clear(WifiConfiguration.KeyMgmt.FT_EAP);
+        return modifiedFlags;
+    }
+
     /**
      * Save an entire network configuration to wpa_supplicant.
      *
      * @param config Config corresponding to the network.
-     * @param netId  Net Id of the network.
+     * @param netId Net Id of the network.
+     * @param addFastTransitionFlags Add the BSS fast transition(80211r) flags to the network.
      * @return true if successful, false otherwise.
      */
-    private boolean saveNetwork(WifiConfiguration config, int netId) {
+    private boolean saveNetwork(WifiConfiguration config, int netId,
+            boolean addFastTransitionFlags) {
         if (config == null) {
             return false;
         }
@@ -640,6 +655,10 @@ public class WifiConfigStore {
                 return false;
             }
         }
+        BitSet allowedKeyManagement = config.allowedKeyManagement;
+        if (addFastTransitionFlags) {
+            allowedKeyManagement = addFastTransitionFlags(config.allowedKeyManagement);
+        }
         String allowedKeyManagementString =
                 makeString(config.allowedKeyManagement, WifiConfiguration.KeyMgmt.strings);
         if (config.allowedKeyManagement.cardinality() != 0 && !mWifiNative.setNetworkVariable(
@@ -804,11 +823,13 @@ public class WifiConfigStore {
     /**
      * Add or update a network configuration to wpa_supplicant.
      *
-     * @param config         Config corresponding to the network.
+     * @param config Config corresponding to the network.
      * @param existingConfig Existing config corresponding to the network saved in our database.
+     * @param addFastTransitionFlags Add the BSS fast transition(80211r) flags to the network.
      * @return true if successful, false otherwise.
      */
-    public boolean addOrUpdateNetwork(WifiConfiguration config, WifiConfiguration existingConfig) {
+    public boolean addOrUpdateNetwork(WifiConfiguration config, WifiConfiguration existingConfig,
+            boolean addFastTransitionFlags) {
         if (config == null) {
             return false;
         }
@@ -832,7 +853,7 @@ public class WifiConfigStore {
             // Save the new network ID to the config
             config.networkId = netId;
         }
-        if (!saveNetwork(config, netId)) {
+        if (!saveNetwork(config, netId, addFastTransitionFlags)) {
             if (newNetwork) {
                 mWifiNative.removeNetwork(netId);
                 loge("Failed to set a network variable, removed network: " + netId);