summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shinji Sogo <shinji.sogo@sonymobile.com> 2015-11-02 10:15:52 +0900
committer Tomoharu Hatano <tomoharu.hatano@sonymobile.com> 2016-09-29 19:43:11 +0900
commit20445f7bd039098f476616f43c95f4dd37b8f6ce (patch)
tree561ac75048f7ba068290022ded99e73fd11faa51
parentb60951f670e5e6d271786f9d0041091b5c16173d (diff)
Don't compare FQDN with providerFriendlyName
FQDN and providor friendly name are obviously different, and if they're compared they're almost always unmatched. FQDN of current configuration should be checked with FQDN of new configuration. Bug:31815374 Test: Test with the device Change-Id: I6c8c8ca07b4abb038175e3999d387f0869ec7391
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java2
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 0a3f0c047744..63d1b1ed9616 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.providerFriendlyName);
+ return config.FQDN.equals(mConfig.FQDN);
} else {
return ssid.equals(removeDoubleQuotes(config.SSID))
&& security == getSecurity(config)