diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-22 01:06:56 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-22 01:06:56 +0000 |
| commit | bd227d04637885683a2420340e4e79679e5f46b5 (patch) | |
| tree | 375019703739853215130840bd75f8afebf28f90 | |
| parent | 070ac7a44503230fb834812db24e1a573591c33f (diff) | |
| parent | cf4ad7ec5552ea84f5d266da3ddddabf55a6698f (diff) | |
| download | wifi-bd227d04637885683a2420340e4e79679e5f46b5.tar.gz | |
Snap for 7571067 from cf4ad7ec5552ea84f5d266da3ddddabf55a6698f to sc-d1-release
Change-Id: Ie06a26ddcacd3b24a6209c0caa0834bea1cffd62
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java index c9f9debdd..9c4f376ac 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java @@ -853,14 +853,16 @@ public class Utils { /** * Helper method to check if the provided |scanResult| corresponds to a EAP network or not. * This checks these conditions: - * - Enable EAP/SHA1 or EAP/SHA256 AKM. + * - Enable EAP/SHA1, EAP/SHA256 AKM, FT/EAP, or EAP-FILS. * - Not a WPA3 Enterprise only network. * - Not a WPA3 Enterprise transition network. * TODO(b/187755981): Move to shared static utils class */ 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("FT/EAP") + || scanResult.capabilities.contains("EAP-FILS")) && !isScanResultForWpa3EnterpriseOnlyNetwork(scanResult) && !isScanResultForWpa3EnterpriseTransitionNetwork(scanResult); } |