diff options
| author | 2015-12-09 17:21:38 +0900 | |
|---|---|---|
| committer | 2016-10-31 10:10:42 +0100 | |
| commit | f29e12217800c32a7e71975b4f25e77a84890bea (patch) | |
| tree | 08c3eb6eae6082140a0aad8056860f1357ce22a2 | |
| parent | 678ba24533139c1e54a9729f3ad9f4614da8fbad (diff) | |
[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
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 63d1b1ed9616..2db7fcced3da 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -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) |