diff options
| author | Roshan Pius <rpius@google.com> | 2017-01-11 14:39:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-11 14:39:20 +0000 |
| commit | d6a732981224e703416ff1787c1de912175b12ad (patch) | |
| tree | 915933cc83cfc19af96c0e405d2a4f516a14be99 | |
| parent | ab9a573e3138911e08d037a6996297be30be20bc (diff) | |
| parent | 82c1e5cda881e7c9c6074f1769e002945e508d65 (diff) | |
| download | android_frameworks_opt_net_wifi-d6a732981224e703416ff1787c1de912175b12ad.tar.gz android_frameworks_opt_net_wifi-d6a732981224e703416ff1787c1de912175b12ad.tar.bz2 android_frameworks_opt_net_wifi-d6a732981224e703416ff1787c1de912175b12ad.zip | |
Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfiguration" into nyc-mr2-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigStore.java | 9 |
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. * |