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 am: 9c84160545

Browse Source 
am: b8bab1df10

Change-Id: Ic019a0f04737d128cc5005be8fe9733f30ee44a3
This commit is contained in:
Shinji Sogo
2016-10-14 14:26:32 +00:00
committed by android-build-merger
parent 29331aed30 b8bab1df10
commit dafb19bb59
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) {
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)