Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't compare FQDN with providerFriendlyName" am: aae64557e1

Browse Source 
am: 9c84160545

Change-Id: I9091af58eb06d5bf89847ac35aba9849e5e758cf
This commit is contained in:
Shinji Sogo
2016-10-13 14:27:05 +00:00
committed by android-build-merger
parent c68597e671 9c84160545
commit b8bab1df10
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -254,7 +254,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
public boolean matches(WifiConfiguration config) { public boolean matches(WifiConfiguration config) {
if (config.isPasspoint() && mConfig != null && mConfig.isPasspoint()) { if (config.isPasspoint() && mConfig != null && mConfig.isPasspoint()) {
return config.FQDN.equals(mConfig.providerFriendlyName); return config.FQDN.equals(mConfig.FQDN);
} else { } else {
return ssid.equals(removeDoubleQuotes(config.SSID)) return ssid.equals(removeDoubleQuotes(config.SSID))
&& security == getSecurity(config) && security == getSecurity(config)