diff options
| author | Sunil Ravi <sunilravi@google.com> | 2020-03-10 19:02:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-10 19:02:52 +0000 |
| commit | aa29cd45c87e53ddbc20111b104217b86f6c7464 (patch) | |
| tree | 8f3b4a8b409546ff78e0e31493477e127e51bb72 | |
| parent | 833bdcd2c159ec52bee906a50fbc1e5e9843afe9 (diff) | |
| parent | a9bf5052ed0bad6a8e230a56bfc0d5534ed334d7 (diff) | |
Merge "Remove FILS AKM changes from validateKeyMgmt()" into rvc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigurationUtil.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java index 3ed456b01..72d8db21c 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -496,8 +496,8 @@ public class WifiConfigurationUtil { private static boolean validateKeyMgmt(BitSet keyMgmnt) { if (keyMgmnt.cardinality() > 1) { - if (keyMgmnt.cardinality() > 4) { - Log.e(TAG, "validateKeyMgmt failed: cardinality > 4"); + if (keyMgmnt.cardinality() > 3) { + Log.e(TAG, "validateKeyMgmt failed: cardinality > 3"); return false; } if (!keyMgmnt.get(WifiConfiguration.KeyMgmt.WPA_EAP)) { @@ -509,11 +509,9 @@ public class WifiConfigurationUtil { Log.e(TAG, "validateKeyMgmt failed: not PSK or 8021X"); return false; } - if (keyMgmnt.cardinality() == 4 - && (!keyMgmnt.get(WifiConfiguration.KeyMgmt.SUITE_B_192) - && !keyMgmnt.get(WifiConfiguration.KeyMgmt.FILS_SHA256) - && !keyMgmnt.get(WifiConfiguration.KeyMgmt.FILS_SHA384))) { - Log.e(TAG, "validateKeyMgmt failed: neither SUITE_B_192 nor FILS"); + if (keyMgmnt.cardinality() == 3 + && !keyMgmnt.get(WifiConfiguration.KeyMgmt.SUITE_B_192)) { + Log.e(TAG, "validateKeyMgmt failed: not SUITE_B_192"); return false; } } |