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

Browse Source 
am: 80fba49386

Change-Id: I15cabf9e4146f1f0d0c31b24d222c34b8477cdb7
This commit is contained in:
Shinji Sogo
2016-12-15 23:38:59 +00:00
committed by android-build-merger
parent dbaca965bb 80fba49386
commit ee05b648c7
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.FQDN); return ssid.equals(removeDoubleQuotes(config.SSID)) && 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)