Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3cc0687 authored by Hai Shalom's avatar Hai Shalom
Browse files

[WPA3] Filter unsupported networks from scan results 

Filter unsupported networks from scan results. New WPA3 networks and OWE
networks may not be compatible with the device HW/SW, and such networks
will not appear in the scan results view.

Bug: 112195778
Test: Functional test with WPA3/OWE AP and confirming filtered correctly
Change-Id: Ic79e533a0e99aa38366b178feafb28bd286202d1
parent ebebce29

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+58 −4
Original line number Diff line number Diff line
@@ -152,7 +152,11 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
    private boolean mNetworkScoringUiEnabled;

    private long mMaxSpeedLabelScoreCacheAge;





    private static final String WIFI_SECURITY_PSK = "PSK";

    private static final String WIFI_SECURITY_EAP = "EAP";

    private static final String WIFI_SECURITY_SAE = "SAE";

    private static final String WIFI_SECURITY_OWE = "OWE";

    private static final String WIFI_SECURITY_SUITE_B_192 = "SUITE_B_192";



    @VisibleForTesting

    Scanner mScanner;
@@ -505,13 +509,18 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
     * {@link #updateAccessPoints(List, List)}.

     */

    private void fetchScansAndConfigsAndUpdateAccessPoints() {

        final List<ScanResult> newScanResults = mWifiManager.getScanResults();

        List<ScanResult> newScanResults = mWifiManager.getScanResults();



        // Filter all unsupported networks from the scan result list

        final List<ScanResult> filteredScanResults =

                filterScanResultsByCapabilities(newScanResults);



        if (isVerboseLoggingEnabled()) {

            Log.i(TAG, "Fetched scan results: " + newScanResults);

            Log.i(TAG, "Fetched scan results: " + filteredScanResults);

        }



        List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();

        updateAccessPoints(newScanResults, configs);

        updateAccessPoints(filteredScanResults, configs);

    }



    /** Update the internal list of access points. */
@@ -937,4 +946,49 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 


        mListener.onAccessPointsChanged();

    }



    /**

     * Filters unsupported networks from scan results. New WPA3 networks and OWE networks

     * may not be compatible with the device HW/SW.

     * @param scanResults List of scan results

     * @return List of filtered scan results based on local device capabilities

     */

    private List<ScanResult> filterScanResultsByCapabilities(List<ScanResult> scanResults) {

        if (scanResults == null) {

            return null;

        }



        // Get and cache advanced capabilities

        final boolean isOweSupported = mWifiManager.isOweSupported();

        final boolean isSaeSupported = mWifiManager.isWpa3SaeSupported();

        final boolean isSuiteBSupported = mWifiManager.isWpa3SuiteBSupported();



        List<ScanResult> filteredScanResultList = new ArrayList<>();



        // Iterate through the list of scan results and filter out APs which are not

        // compatible with our device.

        for (ScanResult scanResult : scanResults) {

            if (scanResult.capabilities.contains(WIFI_SECURITY_PSK)) {

                // All devices (today) support RSN-PSK or WPA-PSK

                // Add this here because some APs may support both PSK and SAE and the check

                // below will filter it out.

                filteredScanResultList.add(scanResult);

                continue;

            }



            if ((scanResult.capabilities.contains(WIFI_SECURITY_SUITE_B_192) && !isSuiteBSupported)

                    || (scanResult.capabilities.contains(WIFI_SECURITY_SAE) && !isSaeSupported)

                    || (scanResult.capabilities.contains(WIFI_SECURITY_OWE) && !isOweSupported)) {

                if (isVerboseLoggingEnabled()) {

                    Log.v(TAG, "filterScanResultsByCapabilities: Filtering SSID "

                            + scanResult.SSID + " with capabilities: " + scanResult.capabilities);

                }

            } else {

                // Safe to add

                filteredScanResultList.add(scanResult);

            }

        }



        return filteredScanResultList;

    }

}