Merge "APs from old scans should not have RSSI values set." into oc-dev

This commit is contained in:
TreeHugger Robot
2017-06-17 02:15:02 +00:00
committed by Android (Google) Code Review

View File

@@ -511,8 +511,11 @@ public class AccessPoint implements Comparable<AccessPoint> {
} }
} }
// Only replace the previous value if we have a recent scan result to use
if (seen != 0) {
mSeen = seen; mSeen = seen;
} }
}
/** /**
* Returns if the network is marked metered. Metering can be marked through its config in * Returns if the network is marked metered. Metering can be marked through its config in
@@ -940,8 +943,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
security = getSecurity(result); security = getSecurity(result);
if (security == SECURITY_PSK) if (security == SECURITY_PSK)
pskType = getPskType(result); pskType = getPskType(result);
mRssi = result.level;
mSeen = result.timestamp; mScanResultCache.put(result.BSSID, result);
updateRssi();
mSeen = result.timestamp; // even if the timestamp is old it is still valid
} }
public void saveWifiState(Bundle savedState) { public void saveWifiState(Bundle savedState) {