summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Chen <jimmycmchen@google.com>2021-07-19 18:53:44 +0800
committerJimmy Chen <jimmycmchen@google.com>2021-07-19 19:28:51 +0800
commita7c60fb7f9240c0fb8824a51d6c0e2be5ba784ff (patch)
treed32ae2448d9db2616af897e9089f4d9905dff00c
parent7e7e1c66c8c42d00baf986042b8f5b4f3f390814 (diff)
downloadwifi-a7c60fb7f9240c0fb8824a51d6c0e2be5ba784ff.tar.gz
wifi: fix FILS network detection in wifi tracker library
Bug: 193584416 Test: use add-fake-scan to check a FILS network is shown as an EAP network in wifi picker. 1. adb shell cmd wifi add-fake-scan fils-test aa:bb:cc:dd:ee:ff \ [WPA2-EAP-FILS-SHA256-CCMP][RSN-EAP-FILS-SHA256-CCMP][ESS] 2412 -55 2. adb shell cmd wifi start-faking-scan 3. check that the type of the network "fils-test" is EAP. Change-Id: Ib4c08509edc36d74ca58aa8897e3377473a55609
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
index c9f9debdd..c008d5e6d 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
@@ -860,7 +860,8 @@ public class Utils {
*/
public static boolean isScanResultForEapNetwork(ScanResult scanResult) {
return (scanResult.capabilities.contains("EAP/SHA1")
- || scanResult.capabilities.contains("EAP/SHA256"))
+ || scanResult.capabilities.contains("EAP/SHA256")
+ || scanResult.capabilities.contains("EAP-FILS"))
&& !isScanResultForWpa3EnterpriseOnlyNetwork(scanResult)
&& !isScanResultForWpa3EnterpriseTransitionNetwork(scanResult);
}