diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 6 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java | 41 |
2 files changed, 16 insertions, 31 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 06ea4459b3ff..d79c5dbd40ee 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -765,11 +765,7 @@ public class AccessPoint implements Comparable<AccessPoint> { } void loadConfig(WifiConfiguration config) { - if (config.isPasspoint()) - ssid = config.providerFriendlyName; - else - ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID)); - + ssid = (config.SSID == null ? "" : removeDoubleQuotes(config.SSID)); bssid = config.BSSID; security = getSecurity(config); networkId = config.networkId; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index c6179943b4d3..fe144b393d91 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -479,29 +479,22 @@ public class WifiTracker { } AccessPoint accessPoint = getCachedOrCreate(config, cachedAccessPoints); if (mLastInfo != null && mLastNetworkInfo != null) { - if (config.isPasspoint() == false) { - accessPoint.update(connectionConfig, mLastInfo, mLastNetworkInfo); - } + accessPoint.update(connectionConfig, mLastInfo, mLastNetworkInfo); } if (mIncludeSaved) { - if (!config.isPasspoint() || mIncludePasspoints) { - // If saved network not present in scan result then set its Rssi to MAX_VALUE - boolean apFound = false; - for (ScanResult result : results) { - if (result.SSID.equals(accessPoint.getSsidStr())) { - apFound = true; - break; - } + // If saved network not present in scan result then set its Rssi to MAX_VALUE + boolean apFound = false; + for (ScanResult result : results) { + if (result.SSID.equals(accessPoint.getSsidStr())) { + apFound = true; + break; } - if (!apFound) { - accessPoint.setRssi(Integer.MAX_VALUE); - } - accessPoints.add(accessPoint); } - - if (config.isPasspoint() == false) { - apMap.put(accessPoint.getSsidStr(), accessPoint); + if (!apFound) { + accessPoint.setRssi(Integer.MAX_VALUE); } + accessPoints.add(accessPoint); + apMap.put(accessPoint.getSsidStr(), accessPoint); } else { // If we aren't using saved networks, drop them into the cache so that // we have access to their saved info. @@ -538,20 +531,16 @@ public class WifiTracker { } if (result.isPasspointNetwork()) { + // Retrieve a WifiConfiguration for a Passpoint provider that matches + // the given ScanResult. This is used for showing that a given AP + // (ScanResult) is available via a Passpoint provider (provider friendly + // name). WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result); if (config != null) { accessPoint.update(config); } } - if (mLastInfo != null && mLastInfo.getBSSID() != null - && mLastInfo.getBSSID().equals(result.BSSID) - && connectionConfig != null && connectionConfig.isPasspoint()) { - /* This network is connected via this passpoint config */ - /* SSID match is not going to work for it; so update explicitly */ - accessPoint.update(connectionConfig); - } - accessPoints.add(accessPoint); apMap.put(accessPoint.getSsidStr(), accessPoint); } |