summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shinji Sogo <shinji.sogo@sonymobile.com> 2016-10-12 15:58:47 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-12 15:58:47 +0000
commit9c84160545ec89d28e96d3d85ddae3a07711cc6e (patch)
treef06193ce51c00744c77fea489d616e65151acc07
parent1b9303e8f09af3081223df5ed8a90259d339ebc0 (diff)
parentaae64557e156b72e3ce9e5f8d9bb2e827a55f97e (diff)
Merge "Don't compare FQDN with providerFriendlyName"
am: aae64557e1 Change-Id: Ib6b070b49221ee39fe45048e54f71c34d637c05a
-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)