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

Commit 69e7f968 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[HS2.0] Need to compare with not only FQDN but SSID"

parents 11ec22ab f29e1221

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

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 


    public boolean matches(WifiConfiguration config) {

        if (config.isPasspoint() && mConfig != null && mConfig.isPasspoint()) {

            return config.FQDN.equals(mConfig.FQDN);

            return ssid.equals(removeDoubleQuotes(config.SSID)) && config.FQDN.equals(mConfig.FQDN);

        } else {

            return ssid.equals(removeDoubleQuotes(config.SSID))

                    && security == getSecurity(config)