Merge "Wifi: Check configKey for ScanResult while visibility is set." (fbbadc98) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiConfiguration.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -575,6 +575,7 @@ public class WifiConfiguration implements Parcelable {
		***/
		public Visibility setVisibility(long age, int configBand) {
		boolean isNetworkFound = false;
		String profileConfigKey = configKey();
		if (scanResultCache == null) {
		visibility = null;
		return null;
		@@ -606,14 +607,18 @@ public class WifiConfiguration implements Parcelable {
		if ((now_ms - result.seen) > age) continue;

		if (result.is5GHz()) {
		if (profileConfigKey.equals(configKey(result))) {
		isNetworkFound = true;
		}
		if (result.level > status.rssi5) {
		status.rssi5 = result.level;
		status.age5 = result.seen;
		status.BSSID5 = result.BSSID;
		}
		} else if (result.is24GHz()) {
		if (profileConfigKey.equals(configKey(result))) {
		isNetworkFound = true;
		}
		if (result.level > status.rssi24) {
		status.rssi24 = result.level;
		status.age24 = result.seen;