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

Commit 20445f7b authored by Shinji Sogo's avatar Shinji Sogo Committed by Tomoharu Hatano
Browse files

Don't compare FQDN with providerFriendlyName 

FQDN and providor friendly name are obviously different, and if they're
compared they're almost always unmatched. FQDN of current configuration
should be checked with FQDN of new configuration.

Bug:31815374
Test: Test with the device

Change-Id: I6c8c8ca07b4abb038175e3999d387f0869ec7391
parent b60951f6

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

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




    public boolean matches(WifiConfiguration config) {

    public boolean matches(WifiConfiguration config) {

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

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

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

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

        } else {

        } else {

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

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

                    && security == getSecurity(config)

                    && security == getSecurity(config)