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

Commit 1c9f3274 authored by Shinji Sogo's avatar Shinji Sogo Committed by android-build-merger
Browse files

Merge "Don't compare FQDN with providerFriendlyName" am: aae64557 am: 9c841605 am: b8bab1df 

am: dafb19bb

Change-Id: Id05db87f864df47245a748531cbdad4b27f6da1c
parents 867b4fca dafb19bb

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.providerFriendlyName);

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

        } else {

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

                    && security == getSecurity(config)