WifiScanningServiceImpl: Pass the band scanned in ScanData

Replace the existing |isAllChannelsScanned| variable with the exact band
that was scanned. Existing users of |isAllChannelsScanned| will
check for both {2g + 5g} & {2g + 5g + dfs} to ensure there is
no functionality change.

Also, add permission check for for |registerScanListener|. This should
only be available to wifi stack (holding NETWORK_STACK permission).

Bug: 119316884
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: Will send for integration tests.
Change-Id: I797aa099ea5f756aef037cc4232f28d95540f95b

4 files changed, 78 insertions, 67 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
index cd015c3f3..5972dacb4 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
@@ -92,12 +92,6 @@ public abstract class BaseWifiScannerImplTest {
         when(mClock.getElapsedSinceBootMillis()).thenReturn(SystemClock.elapsedRealtime());
     }
 
-    protected boolean isAllChannelsScanned(int band) {
-        ChannelCollection collection = mScanner.getChannelHelper().createChannelCollection();
-        collection.addBand(band);
-        return collection.isAllChannels();
-    }
-
     protected Set<Integer> expectedBandScanFreqs(int band) {
         ChannelCollection collection = mScanner.getChannelHelper().createChannelCollection();
         collection.addBand(band);
@@ -125,7 +119,7 @@ public abstract class BaseWifiScannerImplTest {
         doSuccessfulSingleScanTest(settings,
                 expectedBandScanFreqs(WifiScanner.WIFI_BAND_24_GHZ),
                 new HashSet<String>(),
-                ScanResults.create(0, isAllChannelsScanned(WifiScanner.WIFI_BAND_24_GHZ),
+                ScanResults.create(0, WifiScanner.WIFI_BAND_24_GHZ,
                         2400, 2450, 2450, 2400, 2450, 2450, 2400, 2450, 2450), false);
     }
 
@@ -139,7 +133,8 @@ public abstract class BaseWifiScannerImplTest {
 
         doSuccessfulSingleScanTest(settings, createFreqSet(5650),
                 new HashSet<String>(),
-                ScanResults.create(0, 5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED,
+                        5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
     }
 
     @Test
@@ -153,7 +148,8 @@ public abstract class BaseWifiScannerImplTest {
 
         doSuccessfulSingleScanTest(settings, createFreqSet(5650),
                 new HashSet<String>(),
-                ScanResults.create(0, 5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED,
+                        5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
     }
 
     @Test
@@ -169,7 +165,7 @@ public abstract class BaseWifiScannerImplTest {
 
         doSuccessfulSingleScanTest(settings, expectedBandScanFreqs(WifiScanner.WIFI_BAND_24_GHZ),
                 new HashSet<String>(),
-                ScanResults.create(0, isAllChannelsScanned(WifiScanner.WIFI_BAND_24_GHZ),
+                ScanResults.create(0, WifiScanner.WIFI_BAND_24_GHZ,
                         2400, 2450, 2450, 2400, 2450, 2450, 2400, 2450, 2450), true);
     }
 
@@ -193,7 +189,8 @@ public abstract class BaseWifiScannerImplTest {
         }
         doSuccessfulSingleScanTest(settings, createFreqSet(5650),
                 hiddenNetworkSSIDSet,
-                ScanResults.create(0, 5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED,
+                        5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
     }
 
     /**
@@ -221,7 +218,8 @@ public abstract class BaseWifiScannerImplTest {
         }
         doSuccessfulSingleScanTest(settings, createFreqSet(5650),
                 hiddenNetworkSSIDSet,
-                ScanResults.create(0, 5650, 5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED,
+                        5650, 5650, 5650, 5650, 5650, 5650, 5650), false);
     }
 
     @Test
@@ -261,8 +259,6 @@ public abstract class BaseWifiScannerImplTest {
 
         WifiNative.ScanEventHandler eventHandler = mock(WifiNative.ScanEventHandler.class);
 
-        ScanResults results = ScanResults.create(0, 2400, 2450, 2450);
-
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scan fails
@@ -291,8 +287,6 @@ public abstract class BaseWifiScannerImplTest {
 
         WifiNative.ScanEventHandler eventHandler = mock(WifiNative.ScanEventHandler.class);
 
-        ScanResults results = ScanResults.create(0, 2400, 2450, 2450);
-
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scan succeeds
@@ -325,8 +319,6 @@ public abstract class BaseWifiScannerImplTest {
 
         WifiNative.ScanEventHandler eventHandler = mock(WifiNative.ScanEventHandler.class);
 
-        ScanResults results = ScanResults.create(0, 2400, 2450, 2450);
-
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scan succeeds
@@ -393,7 +385,7 @@ public abstract class BaseWifiScannerImplTest {
         expectSuccessfulSingleScan(order, WifiNative.SCAN_TYPE_LOW_LATENCY, eventHandler,
                 expectedBandScanFreqs(WifiScanner.WIFI_BAND_24_GHZ),
                 new HashSet<String>(),
-                ScanResults.create(0, isAllChannelsScanned(WifiScanner.WIFI_BAND_24_GHZ),
+                ScanResults.create(0, WifiScanner.WIFI_BAND_24_GHZ,
                         2400, 2450, 2450), false);
 
         // start second scan
@@ -402,7 +394,7 @@ public abstract class BaseWifiScannerImplTest {
         expectSuccessfulSingleScan(order, WifiNative.SCAN_TYPE_LOW_POWER, eventHandler,
                 expectedBandScanFreqs(WifiScanner.WIFI_BAND_BOTH_WITH_DFS),
                 new HashSet<String>(),
-                ScanResults.create(0, true,
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH_WITH_DFS,
                         5150, 5175), false);
 
         verifyNoMoreInteractions(eventHandler);
@@ -447,7 +439,7 @@ public abstract class BaseWifiScannerImplTest {
         ArrayList<ScanResult> scanDataResults = new ArrayList<>(fullResults);
         Collections.sort(scanDataResults, ScanResults.SCAN_RESULT_RSSI_COMPARATOR);
         ScanData scanData = new ScanData(0, 0, 0,
-                isAllChannelsScanned(WifiScanner.WIFI_BAND_24_GHZ),
+                WifiScanner.WIFI_BAND_24_GHZ,
                 scanDataResults.toArray(new ScanResult[scanDataResults.size()]));
         Set<Integer> expectedScan = expectedBandScanFreqs(WifiScanner.WIFI_BAND_24_GHZ);
 
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
index 1280013fe..d3b3312e9 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
@@ -626,7 +626,7 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH_WITH_DFS,
                 0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
-                ScanResults.create(0, true, 2400, 5150, 5175));
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH_WITH_DFS, 2400, 5150, 5175));
     }
 
     /**
@@ -637,7 +637,7 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings = createRequest(channelsToSpec(2400, 5150, 5175),
                 0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
-                ScanResults.create(0, 2400, 5150, 5175));
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400, 5150, 5175));
     }
 
     /**
@@ -649,7 +649,7 @@ public class WifiScanningServiceTest {
                 channelsToSpec(2400, 2450, 5150, 5175, 5600, 5650, 5660),
                 0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
-                ScanResults.create(0, true, 2400, 5150, 5175));
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400, 5150, 5175));
     }
 
     /**
@@ -660,7 +660,7 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH, 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
-                ScanResults.create(0, new int[0]));
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, new int[0]));
     }
 
     /**
@@ -673,7 +673,7 @@ public class WifiScanningServiceTest {
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         // Create a set of scan results that has results not matching the request settings, but is
         // limited to zero results for the expected results.
-        ScanResults results = ScanResults.createOverflowing(0, 0,
+        ScanResults results = ScanResults.createOverflowing(0, WifiScanner.WIFI_BAND_24_GHZ, 0,
                 ScanResults.generateNativeResults(0, 5150, 5171));
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
                 results);
@@ -1083,13 +1083,13 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings1 = createRequest(channelsToSpec(2400), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId1 = 12;
-        ScanResults results1 = ScanResults.create(0, true, 2400);
+        ScanResults results1 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
 
         WifiScanner.ScanSettings requestSettings2 = createRequest(channelsToSpec(2450, 5175), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId2 = 13;
-        ScanResults results2 = ScanResults.create(0, true, 2450);
+        ScanResults results2 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2450);
 
 
         startServiceAndLoadDriver();
@@ -1152,12 +1152,12 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings1 = createRequest(channelsToSpec(2400), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId1 = 12;
-        ScanResults results1 = ScanResults.create(0, true, 2400);
+        ScanResults results1 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
         WifiScanner.ScanSettings requestSettings2 = createRequest(channelsToSpec(2450, 5175), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId2 = 13;
-        ScanResults results2 = ScanResults.create(0, true, 2450);
+        ScanResults results2 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2450);
 
 
         startServiceAndLoadDriver();
@@ -1222,13 +1222,13 @@ public class WifiScanningServiceTest {
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         requestSettings1.type = WifiScanner.TYPE_LOW_LATENCY;
         int requestId1 = 12;
-        ScanResults results1 = ScanResults.create(0, true, 2400);
+        ScanResults results1 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
         WifiScanner.ScanSettings requestSettings2 = createRequest(channelsToSpec(2400), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         requestSettings2.type = WifiScanner.TYPE_HIGH_ACCURACY;
         int requestId2 = 13;
-        ScanResults results2 = ScanResults.create(0, true, 2400);
+        ScanResults results2 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
         startServiceAndLoadDriver();
         mWifiScanningServiceImpl.setWifiHandlerLogForTest(mLog);
@@ -1292,14 +1292,15 @@ public class WifiScanningServiceTest {
         requestSettings1.type = WifiScanner.TYPE_LOW_LATENCY;
         int requestId1 = 12;
         WorkSource workSource1 = new WorkSource(1121);
-        ScanResults results1 = ScanResults.create(0, false, 2400);
+        ScanResults results1 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
         WifiScanner.ScanSettings requestSettings2 = createRequest(channelsToSpec(2450, 5175), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         requestSettings2.type = WifiScanner.TYPE_HIGH_ACCURACY;
         int requestId2 = 13;
         WorkSource workSource2 = new WorkSource(Binder.getCallingUid()); // don't explicitly set
-        ScanResults results2 = ScanResults.create(0, false, 2450, 5175, 2450);
+        ScanResults results2 =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2450, 5175, 2450);
 
         WifiScanner.ScanSettings requestSettings3 = createRequest(channelsToSpec(5150), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
@@ -1309,12 +1310,14 @@ public class WifiScanningServiceTest {
         WorkSource workSource3 = new WorkSource();
         workSource3.createWorkChain()
                 .addNode(2292, "tag1");
-        ScanResults results3 = ScanResults.create(0, false, 5150, 5150, 5150, 5150);
+        ScanResults results3 =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 5150, 5150, 5150, 5150);
 
         WifiNative.ScanSettings nativeSettings2and3 = createSingleScanNativeSettingsForChannels(
                 WifiNative.SCAN_TYPE_HIGH_ACCURACY, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN,
                 channelsToSpec(2450, 5175, 5150));
-        ScanResults results2and3 = ScanResults.merge(results2, results3);
+        ScanResults results2and3 =
+                ScanResults.merge(WifiScanner.WIFI_BAND_UNSPECIFIED, results2, results3);
         WorkSource workSource2and3 = new WorkSource();
         workSource2and3.add(workSource2);
         workSource2and3.add(workSource3);
@@ -1401,9 +1404,12 @@ public class WifiScanningServiceTest {
     @Test
     public void sendSingleScanRequestWhilePreviousScanRunningAndMergeIntoFirstScan() {
         // Split by frequency to make it easier to determine which results each request is expecting
-        ScanResults results24GHz = ScanResults.create(0, 2400, 2400, 2400, 2450);
-        ScanResults results5GHz = ScanResults.create(0, 5150, 5150, 5175);
-        ScanResults resultsBoth = ScanResults.merge(results24GHz, results5GHz);
+        ScanResults results24GHz =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 2400, 2400, 2400, 2450);
+        ScanResults results5GHz =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 5150, 5150, 5175);
+        ScanResults resultsBoth =
+                ScanResults.merge(WifiScanner.WIFI_BAND_BOTH, results24GHz, results5GHz);
 
         WifiScanner.ScanSettings requestSettings1 = createRequest(
                 WifiScanner.TYPE_HIGH_ACCURACY, WifiScanner.WIFI_BAND_BOTH, 0,
@@ -1466,9 +1472,11 @@ public class WifiScanningServiceTest {
     public void sendMultipleSingleScanRequestWhilePreviousScanRunningAndMergeOneIntoFirstScan()
           throws RemoteException {
         // Split by frequency to make it easier to determine which results each request is expecting
-        ScanResults results2400 = ScanResults.create(0, 2400, 2400, 2400);
-        ScanResults results2450 = ScanResults.create(0, 2450);
-        ScanResults results1and3 = ScanResults.merge(results2400, results2450);
+        ScanResults results2400 =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400, 2400, 2400);
+        ScanResults results2450 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2450);
+        ScanResults results1and3 =
+                ScanResults.merge(WifiScanner.WIFI_BAND_UNSPECIFIED, results2400, results2450);
 
         WifiScanner.ScanSettings requestSettings1 = createRequest(channelsToSpec(2400, 2450), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
@@ -1572,7 +1580,8 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings =
                 createRequest(WifiScanner.WIFI_BAND_BOTH_WITH_DFS,
                               0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults expectedResults = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults expectedResults =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH_WITH_DFS, 2400, 5150, 5175);
         doSuccessfulSingleScan(requestSettings,
                                computeSingleScanNativeSettings(requestSettings),
                                expectedResults);
@@ -1604,7 +1613,7 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH, 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         doSuccessfulSingleScan(requestSettings, computeSingleScanNativeSettings(requestSettings),
-                ScanResults.create(0, new int[0]));
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, new int[0]));
 
         Handler handler = mock(Handler.class);
         BidirectionalAsyncChannel controlChannel = connectChannel(handler);
@@ -1649,7 +1658,8 @@ public class WifiScanningServiceTest {
     public void retrieveMostRecentFullSingleScanResults() throws Exception {
         WifiScanner.ScanSettings requestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH, 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults expectedResults = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults expectedResults = ScanResults.create(
+                0, WifiScanner.WIFI_BAND_BOTH, 2400, 5150, 5175);
         doSuccessfulSingleScan(requestSettings,
                                computeSingleScanNativeSettings(requestSettings),
                                expectedResults);
@@ -1669,7 +1679,7 @@ public class WifiScanningServiceTest {
 
         // now update with a new scan that only has one result
         int secondScanRequestId = 35;
-        ScanResults expectedSingleResult = ScanResults.create(0, true, 5150);
+        ScanResults expectedSingleResult = ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 5150);
         sendSingleScanRequest(controlChannel, secondScanRequestId, requestSettings, null);
 
         mLooper.dispatchAll();
@@ -1705,7 +1715,8 @@ public class WifiScanningServiceTest {
     public void doesNotRetrieveMostRecentPartialSingleScanResults() throws Exception {
         WifiScanner.ScanSettings fullRequestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH, 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults expectedFullResults = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults expectedFullResults =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 2400, 5150, 5175);
         doSuccessfulSingleScan(fullRequestSettings,
                 computeSingleScanNativeSettings(fullRequestSettings),
                 expectedFullResults);
@@ -1727,7 +1738,8 @@ public class WifiScanningServiceTest {
         int secondScanRequestId = 35;
         WifiScanner.ScanSettings partialRequestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH,
                 0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults expectedPartialResults = ScanResults.create(0, false, 5150);
+        ScanResults expectedPartialResults =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_5_GHZ, 5150);
         sendSingleScanRequest(controlChannel, secondScanRequestId, partialRequestSettings, null);
 
         mLooper.dispatchAll();
@@ -1764,7 +1776,8 @@ public class WifiScanningServiceTest {
     public void doesNotRetrieveStaleScanResultsFromLastFullSingleScan() throws Exception {
         WifiScanner.ScanSettings requestSettings = createRequest(WifiScanner.WIFI_BAND_BOTH, 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults scanResults = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults scanResults =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 2400, 5150, 5175);
 
         // Out of the 3 scan results, modify the timestamp of 2 of them to be within the expiration
         // age and 1 out of it.
@@ -1805,7 +1818,8 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings =
                 createRequest(WifiScanner.WIFI_BAND_BOTH_WITH_DFS,
                               0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults expectedResults = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults expectedResults = ScanResults.create(
+                0, WifiScanner.WIFI_BAND_BOTH_WITH_DFS, 2400, 5150, 5175);
         doSuccessfulSingleScan(requestSettings,
                                computeSingleScanNativeSettings(requestSettings),
                                expectedResults);
@@ -1940,21 +1954,24 @@ public class WifiScanningServiceTest {
         WifiScanner.ScanSettings requestSettings1 = createRequest(channelsToSpec(2400), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId1 = 12;
-        ScanResults results1 = ScanResults.create(0, 2400);
+        ScanResults results1 = ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400);
 
         WifiScanner.ScanSettings requestSettings2 = createRequest(channelsToSpec(2450, 5175), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId2 = 13;
-        ScanResults results2 = ScanResults.create(0, 2450, 5175, 2450);
+        ScanResults results2 =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2450, 5175, 2450);
 
         WifiScanner.ScanSettings requestSettings3 = createRequest(channelsToSpec(5150), 0,
                 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
         int requestId3 = 15;
-        ScanResults results3 = ScanResults.create(0, 5150, 5150, 5150, 5150);
+        ScanResults results3 =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 5150, 5150, 5150, 5150);
 
         WifiNative.ScanSettings nativeSettings2and3 = createSingleScanNativeSettingsForChannels(
                 WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN, channelsToSpec(2450, 5175, 5150));
-        ScanResults results2and3 = ScanResults.merge(results2, results3);
+        ScanResults results2and3 =
+                ScanResults.merge(WifiScanner.WIFI_BAND_UNSPECIFIED, results2, results3);
 
         int listenerRequestId = 13;
 
@@ -2148,10 +2165,6 @@ public class WifiScanningServiceTest {
         return ScanResults.create(0, 2400, 5150, 5175);
     }
 
-    private ScanResults createScanResultsForPnoWithNoIE() {
-        return ScanResults.createWithNoIE(0, 2400, 5150, 5175);
-    }
-
     private WifiNative.PnoEventHandler verifyHwPno(InOrder order,
             WifiNative.PnoSettings expected) {
         ArgumentCaptor<WifiNative.PnoSettings> pnoSettingsCaptor =
@@ -2319,7 +2332,7 @@ public class WifiScanningServiceTest {
 
         when(mWifiScannerImpl.startSingleScan(any(WifiNative.ScanSettings.class),
                         any(WifiNative.ScanEventHandler.class))).thenReturn(true);
-        ScanResults results = ScanResults.create(0, 2400);
+        ScanResults results = ScanResults.create(0, WifiScanner.WIFI_BAND_BOTH, 2400);
         when(mWifiScannerImpl.getLatestSingleScanResults())
                 .thenReturn(results.getRawScanData());
 
@@ -2403,7 +2416,8 @@ public class WifiScanningServiceTest {
         WorkSource workSource = new WorkSource(2292);
         WifiScanner.ScanSettings requestSettings = createRequest(channelsToSpec(2400, 5150, 5175),
                 0, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-        ScanResults results = ScanResults.create(0, true, 2400, 5150, 5175);
+        ScanResults results =
+                ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED, 2400, 5150, 5175);
 
         when(mWifiScannerImpl.startSingleScan(any(WifiNative.ScanSettings.class),
                 any(WifiNative.ScanEventHandler.class))).thenReturn(true);
@@ -2488,10 +2502,13 @@ public class WifiScanningServiceTest {
         controlChannel.sendMessage(Message.obtain(null, WifiScanner.CMD_STOP_PNO_SCAN));
         mLooper.dispatchAll();
 
+        controlChannel.sendMessage(Message.obtain(null, WifiScanner.CMD_REGISTER_SCAN_LISTENER));
+        mLooper.dispatchAll();
+
         // All 4 of the above messages should have been rejected because the app doesn't have
         // the required permissions.
         ArgumentCaptor<Message> messageCaptor = ArgumentCaptor.forClass(Message.class);
-        verify(handler, times(4)).handleMessage(messageCaptor.capture());
+        verify(handler, times(5)).handleMessage(messageCaptor.capture());
         assertFailedResponse(0, WifiScanner.REASON_NOT_AUTHORIZED,
                 "Not authorized", messageCaptor.getAllValues().get(0));
         assertFailedResponse(0, WifiScanner.REASON_NOT_AUTHORIZED,
@@ -2500,6 +2517,8 @@ public class WifiScanningServiceTest {
                 "Not authorized", messageCaptor.getAllValues().get(2));
         assertFailedResponse(0, WifiScanner.REASON_NOT_AUTHORIZED,
                 "Not authorized", messageCaptor.getAllValues().get(3));
+        assertFailedResponse(0, WifiScanner.REASON_NOT_AUTHORIZED,
+                "Not authorized", messageCaptor.getAllValues().get(4));
 
         // Ensure we didn't create scanner instance.
         verify(mWifiScannerImplFactory, never()).create(any(), any(), any());
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
index e522bda88..390683f09 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
@@ -93,7 +93,7 @@ public class WificondPnoScannerTest {
 
         WifiNative.PnoEventHandler pnoEventHandler = mock(WifiNative.PnoEventHandler.class);
         WifiNative.PnoSettings pnoSettings = createDummyPnoSettings(false);
-        ScanResults scanResults = createDummyScanResults(false);
+        ScanResults scanResults = createDummyScanResults();
 
         InOrder order = inOrder(pnoEventHandler, mWifiNative);
         // Start PNO scan
@@ -128,7 +128,7 @@ public class WificondPnoScannerTest {
         startSuccessfulPnoScan(null, pnoSettings, null, pnoEventHandler);
         mLooper.dispatchAll();
         InOrder order = inOrder(pnoEventHandler, mWifiNative);
-        ScanResults scanResults = createDummyScanResults(false);
+        ScanResults scanResults = createDummyScanResults();
         expectSuccessfulHwDisconnectedPnoScan(order, pnoSettings, pnoEventHandler, scanResults);
         verifyNoMoreInteractions(pnoEventHandler);
     }
@@ -167,9 +167,9 @@ public class WificondPnoScannerTest {
         return settings;
     }
 
-    private ScanResults createDummyScanResults(boolean allChannelsScanned) {
-        return ScanResults.create(0, allChannelsScanned, 2400, 2450, 2450, 2400, 2450, 2450, 2400,
-                2450, 2450);
+    private ScanResults createDummyScanResults() {
+        return ScanResults.create(0, WifiScanner.WIFI_BAND_UNSPECIFIED,  2400, 2450, 2450, 2400,
+                2450, 2450, 2400, 2450, 2450);
     }
 
     private void startSuccessfulPnoScan(WifiNative.ScanSettings scanSettings,
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java
index 28b1456d7..c9fc1c2bb 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java
@@ -117,7 +117,7 @@ public class WificondScannerTest extends BaseWifiScannerImplTest {
         doSuccessfulSingleScanTest(settings,
                 expectedBandScanFreqs(WifiScanner.WIFI_BAND_24_GHZ),
                 new HashSet<String>(),
-                ScanResults.create(0, isAllChannelsScanned(WifiScanner.WIFI_BAND_24_GHZ),
+                ScanResults.create(0, WifiScanner.WIFI_BAND_24_GHZ,
                         2400, 2450, 2450, 2400, 2450, 2450, 2400, 2450, 2450), false);
 
         mWifiMonitor.sendMessage(IFACE_NAME, WifiMonitor.SCAN_RESULTS_EVENT);