Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfiguration" into nyc-mr2-dev

1 files changed, 9 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index beb3373d2..e4aef24c6 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -341,6 +341,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);
@@ -605,6 +607,13 @@ public class WifiConfigStore {
         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.
      *