diff options
| author | Sunil Ravi <sunilravi@google.com> | 2020-07-27 12:21:54 -0700 |
|---|---|---|
| committer | Sunil Ravi <sunilravi@google.com> | 2020-08-04 17:04:51 +0000 |
| commit | 6c33a7523e332766e47537cd2333c2fab234b44c (patch) | |
| tree | c5c0a054d6c8c7e01c786df676848bf6ebad3f51 /service | |
| parent | b64129c61416da5a3817d328a7adb166485254ea (diff) | |
Mark FILS akm as EAP in scan result capabilities.
WiFi picker tag the security type of a network based on the
ScanResult capabilities string . Capabilty string for
Fast initial link setup (FILS) key management doesn't have
string "EAP" because of which wifi picker doesn't recognize the
FILS only network as secured AP.
Fix is to rename current key management string FILS-SHA256 and
to FILS-SHA384 to EAP-FILS-SHA256 and EAP-FILS-SHA384 so that
wifi picker will recognize security type as EAP.
Bug: 160760306
Bug: 161241874
Test: com.android.server.wifi
Test: Manually connect to a network which advertise only FILS AKM
Change-Id: Icaab4663169077a7070dcb9491cdf533f60f5209
Merged-In: Icaab4663169077a7070dcb9491cdf533f60f5209
(cherry picked from commit 3b56976d91ab1b3be65790716cc19b271b64b3e4)
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/util/InformationElementUtil.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/util/InformationElementUtil.java b/service/java/com/android/server/wifi/util/InformationElementUtil.java index 60d074e00..a94c15f8b 100644 --- a/service/java/com/android/server/wifi/util/InformationElementUtil.java +++ b/service/java/com/android/server/wifi/util/InformationElementUtil.java @@ -918,8 +918,8 @@ public class InformationElementUtil { private static final int RSN_AKM_OWE = 0x12ac0f00; private static final int RSN_AKM_EAP_SUITE_B_192 = 0x0cac0f00; private static final int RSN_OSEN = 0x019a6f50; - private static final int RSN_AKM_FILS_SHA256 = 0x0eac0f00; - private static final int RSN_AKM_FILS_SHA384 = 0x0fac0f00; + private static final int RSN_AKM_EAP_FILS_SHA256 = 0x0eac0f00; + private static final int RSN_AKM_EAP_FILS_SHA384 = 0x0fac0f00; private static final int WPA_CIPHER_NONE = 0x00f25000; private static final int WPA_CIPHER_TKIP = 0x02f25000; @@ -1022,10 +1022,10 @@ public class InformationElementUtil { case RSN_OSEN: rsnKeyManagement.add(ScanResult.KEY_MGMT_OSEN); break; - case RSN_AKM_FILS_SHA256: + case RSN_AKM_EAP_FILS_SHA256: rsnKeyManagement.add(ScanResult.KEY_MGMT_FILS_SHA256); break; - case RSN_AKM_FILS_SHA384: + case RSN_AKM_EAP_FILS_SHA384: rsnKeyManagement.add(ScanResult.KEY_MGMT_FILS_SHA384); break; default: @@ -1307,9 +1307,9 @@ public class InformationElementUtil { case ScanResult.KEY_MGMT_WAPI_CERT: return "WAPI-CERT"; case ScanResult.KEY_MGMT_FILS_SHA256: - return "FILS-SHA256"; + return "EAP-FILS-SHA256"; case ScanResult.KEY_MGMT_FILS_SHA384: - return "FILS-SHA384"; + return "EAP-FILS-SHA384"; default: return "?"; } |