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

Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a am: 80fba49386

Browse Source 
am: ee05b648c7

Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae
This commit is contained in:
Shinji Sogo
2016-12-16 01:42:55 +00:00
committed by android-build-merger
parent 97ca11cf43 ee05b648c7
commit 3bd405bd72
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

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