commit e67395a97a11706a0ff9b514d84f72fb84dc85fe
author Shinji Sogo <shinji.sogo@sonymobile.com> Thu Dec 15 22:32:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 15 22:32:03 2016 +0000
tree f362d07ce074a8bce429e78b8c6f88f02c43b99a
parent df296fe1fa254ef0ca2ac40a9eb93b35d8f1c99c
parent 69e7f9683d2c76c0be891e05727a649f2c03a866

Merge "[HS2.0] Need to compare with not only FQDN but SSID"
am: 69e7f9683d

Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990

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

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 3a16a75..252aaab 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 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)