Merge "Revert "WifiScanningService: Don't cache results of partial scan"" into oc-dev

am: 04977155d7

Change-Id: Ia6d23845accb6b06666fded6a6f7bf5dcc971cf2

1 files changed, 2 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
index 771e336d5..08c9e1359 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -447,7 +447,6 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
         private RequestList<ScanSettings> mActiveScans = new RequestList<>();
         private RequestList<ScanSettings> mPendingScans = new RequestList<>();
 
-        // Scan results cached from the last full single scan request.
         private ScanResult[] mCachedScanResults = new ScanResult[0];
 
         WifiSingleScanStateMachine(Looper looper) {
@@ -880,11 +879,8 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
                 entry.reportEvent(WifiScanner.CMD_SCAN_RESULT, 0, parcelableAllResults);
             }
 
-            // Since we use NoBandChannelHelper, as long as a specific band is mentioned, the scan
-            // request is treated as full band (WifiScanner.WIFI_BAND_*).
-            if (results.isAllChannelsScanned()) {
-                mCachedScanResults = results.getResults();
-            }
+            // Cache the results here so that apps can retrieve them.
+            mCachedScanResults = results.getResults();
             sendScanResultBroadcast(true);
         }