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

am: d68b6dc56b

Change-Id: If442689c6a05ad261a846a5252d9a0256520508e

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 b945700,b299961..45032ce
--- 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
@@@ -250,13 -248,14 +250,14 @@@ public class WifiTracker 
              mLastNetworkInfo = mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());
  
              final List<ScanResult> newScanResults = mWifiManager.getScanResults();
 +            if (sVerboseLogging) {
 +                Log.i(TAG, "Fetched scan results: " + newScanResults);
 +            }
 +
              List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+             mInternalAccessPoints.clear();
              updateAccessPointsLocked(newScanResults, configs);
  
 -            if (DBG) {
 -                Log.d(TAG, "force update - internal access point list:\n" + mInternalAccessPoints);
 -            }
 -
              // Synchronously copy access points
              mMainHandler.removeMessages(MainHandler.MSG_ACCESS_POINT_CHANGED);
              mMainHandler.handleMessage(
@@@ -484,12 -483,9 +485,12 @@@
      private void updateAccessPoints() {
          List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
          final List<ScanResult> newScanResults = mWifiManager.getScanResults();
 +        if (sVerboseLogging) {
 +            Log.i(TAG, "Fetched scan results: " + newScanResults);
 +        }
  
          synchronized (mLock) {
-             if(!mStaleScanResults) {
+             if(!sStaleScanResults) {
                  updateAccessPointsLocked(newScanResults, configs);
              }
          }