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

Commit 9c841605 authored by Shinji Sogo's avatar Shinji Sogo Committed by android-build-merger
Browse files

Merge "Don't compare FQDN with providerFriendlyName" 

am: aae64557

Change-Id: Ib6b070b49221ee39fe45048e54f71c34d637c05a
parents 1b9303e8 aae64557

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

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

        } else {

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

                    && security == getSecurity(config)