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

Commit f29e1221 authored by Shinji Sogo's avatar Shinji Sogo Committed by Zoran Jovanovic
Browse files

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

When there are APs with different SSID but the same
Passpoint configuration, connection status is shown for
the multiple APs though actually a device can be connected
to only one AP.

Bug:32136285

Change-Id: Iec5e5d1deb45aad68827500c23213ec7a8342229
parent 678ba245

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)