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

am: 65c00b2f4e

Change-Id: I543f873621ffa26818d6b237d8ed3d1c7769ad98

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

@@ -540,7 +540,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
             }
         }
 
-        mSeen = seen;
+        // Only replace the previous value if we have a recent scan result to use
+        if (seen != 0) {
+            mSeen = seen;
+        }
     }
 
     /**
@@ -984,8 +987,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
         security = getSecurity(result);
         if (security == SECURITY_PSK)
             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) {