summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shinji Sogo <shinji.sogo@sonymobile.com> 2016-10-14 14:26:32 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-14 14:26:32 +0000
commitdafb19bb599a5e8da3e2fe6aa8002791d7279aa0 (patch)
treeebb93f33cd537fd362fc65dd8f748fa37eb8d204
parent29331aed30004df0b4f6066ad04f55e4513e09e5 (diff)
parentb8bab1df105bf8752955ca609789129433c605bf (diff)
Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1 am: 9c84160545
am: b8bab1df10 Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
-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 89d32f09321c..3a16a75f26db 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)