diff options
| author | 2016-12-15 23:04:21 +0000 | |
|---|---|---|
| committer | 2016-12-15 23:04:21 +0000 | |
| commit | 80fba493863fb1d11e75e6c78f7128852b7ecee9 (patch) | |
| tree | a2d775abbf7272c62ec7d37a1c426bc021338c03 | |
| parent | 106821edfeee71044f081fba7c9b6d81cd9352b1 (diff) | |
| parent | e67395a97a11706a0ff9b514d84f72fb84dc85fe (diff) | |
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d
am: e67395a97a
Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
| -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 6bc1d129b35d..6e692ef3f70b 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) |