Merge "Do not evict scan results in cold start." into oc-dr1-dev

diff --cc packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
Simple merge

diff --cc packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 5a35da9,04bb802..b299961
--- 1/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
--- 2/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@@ -371,18 -372,15 +372,18 @@@ public class WifiTracker 
  
              mWorkHandler.removePendingMessages();
              mMainHandler.removePendingMessages();
+             sStaleScanResults = true;
          }
-         mStaleScanResults = true;
      }
  
 -    private void unregisterAndClearScoreCache() {
 +    private void unregisterScoreCache() {
          mNetworkScoreManager.unregisterNetworkScoreCache(NetworkKey.TYPE_WIFI, mScoreCache);
 -        mScoreCache.clearScores();
  
 -        // Synchronize on mLock to avoid concurrent modification during updateAccessPoints
 +        // We do not want to clear the existing scores in the cache, as this method is called during
 +        // stop tracking on activity pause. Hence, on resumption we want the ability to show the
 +        // last known, potentially stale, scores. However, by clearing requested scores, the scores
 +        // will be requested again upon resumption of tracking, and if any changes have occurred
 +        // the listeners (UI) will be updated accordingly.
          synchronized (mLock) {
              mRequestedScores.clear();
          }

diff --cc packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Simple merge