From f29e12217800c32a7e71975b4f25e77a84890bea Mon Sep 17 00:00:00 2001 From: Shinji Sogo Date: Wed, 9 Dec 2015 17:21:38 +0900 Subject: [PATCH] [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 --- .../src/com/android/settingslib/wifi/AccessPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 63d1b1ed96164..2db7fcced3dae 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 { 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)