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

Commit 3bd405bd authored by Shinji Sogo's avatar Shinji Sogo Committed by android-build-merger
Browse files

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

Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f968 am: e67395a9 am: 80fba493
am: ee05b648

Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae
parents 97ca11cf ee05b648

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,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)