Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" (bedf92ed) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -687,11 +687,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));

		bssid = config.BSSID;
		security = getSecurity(config);
		networkId = config.networkId;

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+15 −26

Original line number	Diff line number	Diff line
		@@ -344,12 +344,9 @@ public class WifiTracker {
		}
		AccessPoint accessPoint = getCachedOrCreate(config, cachedAccessPoints);
		if (mLastInfo != null && mLastNetworkInfo != null) {
		if (config.isPasspoint() == false) {
		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) {
		@@ -362,11 +359,7 @@ public class WifiTracker {
		accessPoint.setRssi(Integer.MAX_VALUE);
		}
		accessPoints.add(accessPoint);
		}

		if (config.isPasspoint() == false) {
		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.
		@@ -397,20 +390,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);
		}