Remove the usage of NoBandChannelHelper

NoBandChannelHelper is used on devices where HAL based
getChannelsForBand() APIs are not supported.

While getChannelsForBand() APIs are based on wificond now, we
can remove NoBandChannelHelper to reduce the code complexity.

This also fixes WificondPnoScannerTest, where both
createDummyScanSettings() and createDummyScanResults() should
be consistent on boolean |allChannelsScanned|.

Bug: 35707768
Test: compile, unit tests

Change-Id: I1c3007d6bb159c1b58c4b5370f8682fbeb8750d8

4 files changed, 23 insertions, 528 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java
index c728d5f56..e02fe776e 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/BackgroundScanSchedulerTest.java
@@ -650,113 +650,6 @@ public class BackgroundScanSchedulerTest {
         assertChannels(combinedBucketChannelSet, expectedBucketChannelSet);
     }
 
-    /**
-     * Add 2 background scan requests with different time intervals, but one of the setting channels
-     * is totally contained in the other setting. Ensure that the requests are collapsed into a
-     * common bucket with the lower time period setting.
-     * This is done with NoBandChannelHelper.
-     */
-    @Test
-    public void optimalScheduleFullyCollapsesDuplicateChannelsInBandWithNoBandChannelHelper() {
-        BackgroundScanScheduler scheduler = createSchedulerWithNoBandChannelHelper();
-
-        ArrayList<ScanSettings> requests = new ArrayList<>();
-        requests.add(createRequest(channelsToSpec(2400, 2450), 160000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-        requests.add(createRequest(WifiScanner.WIFI_BAND_BOTH_WITH_DFS, 10000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-
-        scheduler.setMaxBuckets(2);
-        scheduler.setMaxChannelsPerBucket(2);
-        scheduler.updateSchedule(requests);
-        WifiNative.ScanSettings schedule = scheduler.getSchedule();
-
-        assertEquals("base_period_ms", 10000, schedule.base_period_ms);
-        assertBuckets(schedule, 1);
-
-        assertEquals("scheduled bucket", 0, scheduler.getScheduledBucket(requests.get(0)));
-        assertEquals("scheduled bucket", 0, scheduler.getScheduledBucket(requests.get(1)));
-
-        assertEquals("band", schedule.buckets[0].band, WifiScanner.WIFI_BAND_BOTH_WITH_DFS);
-    }
-
-    /**
-     * Add 2 background scan requests with different time intervals, but one of the setting channels
-     * is partially contained in the other setting. Ensure that the requests are partially split
-     * across the lower time period bucket.
-     */
-    @Test
-    public void optimalSchedulePartiallyCollapsesDuplicateChannelsWithNoBandChannelHelper() {
-        BackgroundScanScheduler scheduler = createSchedulerWithNoBandChannelHelper();
-
-        ArrayList<ScanSettings> requests = new ArrayList<>();
-        requests.add(createRequest(channelsToSpec(2400, 2450), 10000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-        requests.add(createRequest(channelsToSpec(2400, 2450, 5175), 240000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-
-        scheduler.setMaxBuckets(2);
-        scheduler.setMaxChannelsPerBucket(3);
-        scheduler.updateSchedule(requests);
-        WifiNative.ScanSettings schedule = scheduler.getSchedule();
-
-        assertEquals("base_period_ms", 10000, schedule.base_period_ms);
-        assertBuckets(schedule, 2);
-
-        assertEquals("scheduled bucket", 0, scheduler.getScheduledBucket(requests.get(0)));
-        assertEquals("scheduled bucket", 1, scheduler.getScheduledBucket(requests.get(1)));
-
-        Set<Integer> expectedBucketChannelSet = new ArraySet<>();
-        expectedBucketChannelSet.add(2400);
-        expectedBucketChannelSet.add(2450);
-        assertBucketChannels(schedule.buckets[0], expectedBucketChannelSet);
-
-        expectedBucketChannelSet.clear();
-        expectedBucketChannelSet.add(5175);
-        assertBucketChannels(schedule.buckets[1], expectedBucketChannelSet);
-    }
-
-    /**
-     * Add 2 background scan requests with the second scan request having channels more than the
-     * max, ensure that the last bucket is split.
-     */
-    @Test
-    public void optimalScheduleShouldSplitBucketsWithNoBandChannelHelper() {
-        BackgroundScanScheduler scheduler = createSchedulerWithNoBandChannelHelper();
-
-        ArrayList<ScanSettings> requests = new ArrayList<>();
-        requests.add(createRequest(channelsToSpec(2400, 2450), 10000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-        requests.add(createRequest(channelsToSpec(5150, 5175, 5600, 5650), 240000, 0, 20,
-                WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN));
-
-        scheduler.setMaxBuckets(3);
-        scheduler.setMaxChannelsPerBucket(2);
-        scheduler.updateSchedule(requests);
-        WifiNative.ScanSettings schedule = scheduler.getSchedule();
-
-        assertEquals("base_period_ms", 10000, schedule.base_period_ms);
-        assertBuckets(schedule, 3);
-
-        assertEquals("scheduled bucket", 0, scheduler.getScheduledBucket(requests.get(0)));
-        assertEquals("scheduled bucket", 1, scheduler.getScheduledBucket(requests.get(1)));
-
-        Set<Integer> expectedBucketChannelSet = new ArraySet<>();
-        expectedBucketChannelSet.add(2400);
-        expectedBucketChannelSet.add(2450);
-        assertBucketChannels(schedule.buckets[0], expectedBucketChannelSet);
-
-        expectedBucketChannelSet.clear();
-        expectedBucketChannelSet.add(5150);
-        expectedBucketChannelSet.add(5175);
-        assertBucketChannels(schedule.buckets[1], expectedBucketChannelSet);
-
-        expectedBucketChannelSet.clear();
-        expectedBucketChannelSet.add(5600);
-        expectedBucketChannelSet.add(5650);
-        assertBucketChannels(schedule.buckets[2], expectedBucketChannelSet);
-    }
-
     protected Set<Integer> getAllChannels(BucketSettings bucket) {
         KnownBandsChannelCollection collection = mChannelHelper.createChannelCollection();
         collection.addChannels(bucket);
@@ -930,16 +823,6 @@ public class BackgroundScanSchedulerTest {
                 + expectedChannelSet, channelSet.containsAll(expectedChannelSet));
     }
 
-    private BackgroundScanScheduler createSchedulerWithNoBandChannelHelper() {
-        NoBandChannelHelper channelHelper = new NoBandChannelHelper();
-        BackgroundScanScheduler scheduler = new BackgroundScanScheduler(channelHelper);
-        scheduler.setMaxBuckets(DEFAULT_MAX_BUCKETS);
-        scheduler.setMaxChannelsPerBucket(DEFAULT_MAX_CHANNELS_PER_BUCKET);
-        scheduler.setMaxBatch(DEFAULT_MAX_BATCH);
-        scheduler.setMaxApPerScan(DEFAULT_MAX_AP_PER_SCAN);
-        return scheduler;
-    }
-
     private static int[] getPredefinedBuckets() {
         try {
             Field f = BackgroundScanScheduler.class.getDeclaredField("PREDEFINED_BUCKET_PERIODS");
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java
deleted file mode 100644
index 145b2143c..000000000
--- a/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.wifi.scanner;
-
-import static com.android.server.wifi.ScanTestUtil.bandIs;
-import static com.android.server.wifi.ScanTestUtil.channelsAre;
-import static com.android.server.wifi.ScanTestUtil.channelsToSpec;
-import static com.android.server.wifi.ScanTestUtil.createRequest;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import android.net.wifi.WifiScanner;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import com.android.server.wifi.WifiNative;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-
-/**
- * Unit tests for {@link com.android.server.wifi.scanner.NoBandChannelHelper}.
- */
-@RunWith(Enclosed.class) // WARNING: tests cannot be declared in the outer class
-public class NoBandChannelHelperTest {
-    private static final int ALL_BANDS = WifiScanner.WIFI_BAND_BOTH_WITH_DFS;
-
-    /**
-     * Unit tests for
-     * {@link com.android.server.wifi.scanner.NoBandChannelHelper.estimateScanDuration}.
-     */
-    @SmallTest
-    public static class EstimateScanDurationTest {
-        NoBandChannelHelper mChannelHelper;
-
-        /**
-         * Called before each test
-         * Create a channel helper
-         */
-        @Before
-        public void setUp() throws Exception {
-            mChannelHelper = new NoBandChannelHelper();
-        }
-
-        /**
-         * check a settings object with a few channels
-         */
-        @Test
-        public void fewChannels() {
-            WifiScanner.ScanSettings testSettings = createRequest(channelsToSpec(2400, 2450, 5100),
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertEquals(ChannelHelper.SCAN_PERIOD_PER_CHANNEL_MS * 3,
-                    mChannelHelper.estimateScanDuration(testSettings));
-        }
-
-        /**
-         * check a settings object with a band
-         */
-        @Test
-        public void band() {
-            WifiScanner.ScanSettings testSettings = createRequest(WifiScanner.WIFI_BAND_24_GHZ,
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertTrue("Expected scan to take some time",
-                    mChannelHelper.estimateScanDuration(testSettings)
-                    >= ChannelHelper.SCAN_PERIOD_PER_CHANNEL_MS);
-        }
-    }
-
-    /**
-     * Unit tests for
-     * {@link com.android.server.wifi.scanner.NoBandChannelHelper.getAvailableScanChannels}.
-     */
-    @SmallTest
-    public static class GetAvailableScanChannelsTest {
-        NoBandChannelHelper mChannelHelper;
-
-        /**
-         * Called before each test
-         * Create a channel helper
-         */
-        @Before
-        public void setUp() throws Exception {
-            mChannelHelper = new NoBandChannelHelper();
-        }
-
-        /**
-         * Test that getting the channels for each band results in the expected empty list
-         */
-        @Test
-        public void eachBandValue() {
-            for (int band = WifiScanner.WIFI_BAND_24_GHZ;
-                    band <= WifiScanner.WIFI_BAND_BOTH_WITH_DFS; ++band) {
-                WifiScanner.ChannelSpec[] channels =
-                        mChannelHelper.getAvailableScanChannels(band);
-                assertEquals("expected zero channels", 0, channels.length);
-            }
-        }
-    }
-
-    /**
-     * Unit tests for
-     * {@link com.android.server.wifi.scanner.NoBandChannelHelper.settingsContainChannel}.
-     */
-    @SmallTest
-    public static class SettingsContainChannelTest {
-        NoBandChannelHelper mChannelHelper;
-
-        /**
-         * Called before each test
-         * Create a channel helper
-         */
-        @Before
-        public void setUp() throws Exception {
-            mChannelHelper = new NoBandChannelHelper();
-        }
-
-        /**
-         * check a settings object with no channels
-         */
-        @Test
-        public void emptySettings() {
-            WifiScanner.ScanSettings testSettings = createRequest(channelsToSpec(),
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertFalse(mChannelHelper.settingsContainChannel(testSettings, 2400));
-            assertFalse(mChannelHelper.settingsContainChannel(testSettings, 5150));
-            assertFalse(mChannelHelper.settingsContainChannel(testSettings, 5650));
-        }
-
-        /**
-         * check a settings object with some channels
-         */
-        @Test
-        public void settingsWithChannels() {
-            WifiScanner.ScanSettings testSettings = createRequest(channelsToSpec(2400, 5650),
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 2400));
-            assertFalse(mChannelHelper.settingsContainChannel(testSettings, 5150));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 5650));
-        }
-
-        /**
-         * check a settings object with a band specified
-         */
-        @Test
-        public void settingsWithBand() {
-            WifiScanner.ScanSettings testSettings = createRequest(WifiScanner.WIFI_BAND_24_GHZ,
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 2400));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 2450));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 5150));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 5650));
-        }
-
-        /**
-         * check a settings object with multiple bands specified
-         */
-        @Test
-        public void settingsWithMultiBand() {
-            WifiScanner.ScanSettings testSettings = createRequest(WifiScanner.WIFI_BAND_BOTH,
-                    10000, 0, 20, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN);
-
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 2400));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 2450));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 5150));
-            assertTrue(mChannelHelper.settingsContainChannel(testSettings, 5650));
-        }
-    }
-
-    /**
-     * Unit tests for
-     * {@link com.android.server.wifi.scanner.NoBandChannelHelper.NoBandChannelCollection}.
-     */
-    @SmallTest
-    public static class NoBandsChannelCollectionTest {
-        ChannelHelper.ChannelCollection mChannelCollection;
-
-        /**
-         * Called before each test
-         * Create a collection to use for each test
-         */
-        @Before
-        public void setUp() throws Exception {
-            mChannelCollection = new NoBandChannelHelper().createChannelCollection();
-        }
-
-        /**
-         * Create an empty collection
-         */
-        @Test
-        public void empty() {
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, channelsAre());
-
-            assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getScanFreqs());
-
-            assertTrue(mChannelCollection.isEmpty());
-            assertFalse(mChannelCollection.containsChannel(2400));
-            assertFalse(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add something to a collection and then clear it and make sure nothing is in it
-         */
-        @Test
-        public void clear() {
-            mChannelCollection.addBand(WifiScanner.WIFI_BAND_24_GHZ);
-            mChannelCollection.clear();
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, channelsAre());
-
-            assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getScanFreqs());
-
-            assertTrue(mChannelCollection.isEmpty());
-            assertFalse(mChannelCollection.containsChannel(2400));
-            assertFalse(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a single band to the collection
-         */
-        @Test
-        public void addBand() {
-            mChannelCollection.addBand(WifiScanner.WIFI_BAND_24_GHZ);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, bandIs(ALL_BANDS));
-
-            assertNull(mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertTrue(mChannelCollection.containsChannel(5150));
-            assertTrue(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a single channel to the collection
-         */
-        @Test
-        public void addChannel_single() {
-            mChannelCollection.addChannel(2400);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, channelsAre(2400));
-
-            assertEquals(new HashSet<Integer>(Arrays.asList(2400)),
-                    mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertFalse(mChannelCollection.containsChannel(5150));
-            assertFalse(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a multiple channels to the collection
-         */
-        @Test
-        public void addChannel_multiple() {
-            mChannelCollection.addChannel(2400);
-            mChannelCollection.addChannel(2450);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, channelsAre(2400, 2450));
-
-            assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450)),
-                    mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertFalse(mChannelCollection.containsChannel(5150));
-            assertFalse(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a band and channel that is on that band
-         */
-        @Test
-        public void addChannel_and_addBand_sameBand() {
-            mChannelCollection.addBand(WifiScanner.WIFI_BAND_24_GHZ);
-            mChannelCollection.addChannel(2400);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, bandIs(ALL_BANDS));
-
-            assertNull(mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertTrue(mChannelCollection.containsChannel(5150));
-            assertTrue(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a band and channel that is not that band
-         */
-        @Test
-        public void addChannel_and_addBand_withDifferentBandChannel() {
-            mChannelCollection.addBand(WifiScanner.WIFI_BAND_24_GHZ);
-            mChannelCollection.addChannel(5150);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, bandIs(ALL_BANDS));
-
-            assertNull(mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertTrue(mChannelCollection.containsChannel(5150));
-            assertTrue(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add a band that should contain all channels
-         */
-        @Test
-        public void addChannel_and_addBand_all() {
-            mChannelCollection.addBand(WifiScanner.WIFI_BAND_BOTH_WITH_DFS);
-            mChannelCollection.addChannel(5150);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
-            assertThat(bucketSettings, bandIs(WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
-
-            assertNull(mChannelCollection.getScanFreqs());
-
-            assertFalse(mChannelCollection.isEmpty());
-            assertTrue(mChannelCollection.containsChannel(2400));
-            assertTrue(mChannelCollection.containsChannel(5150));
-            assertTrue(mChannelCollection.containsChannel(5600));
-            assertTrue(mChannelCollection.isAllChannels());
-        }
-
-        /**
-         * Add enough channels on a single band that the max channels is exceeded
-         */
-        @Test
-        public void addChannel_exceedMaxChannels() {
-            mChannelCollection.addChannel(5600);
-            mChannelCollection.addChannel(5650);
-            mChannelCollection.addChannel(5660);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, 2);
-            assertThat(bucketSettings, bandIs(ALL_BANDS));
-            assertFalse(mChannelCollection.isAllChannels()); // can't determine from just channels
-        }
-
-        /**
-         * Add enough channels across multiple bands that the max channels is exceeded
-         */
-        @Test
-        public void addChannel_exceedMaxChannelsOnMultipleBands() {
-            mChannelCollection.addChannel(2400);
-            mChannelCollection.addChannel(2450);
-            mChannelCollection.addChannel(5150);
-
-            WifiNative.BucketSettings bucketSettings = new WifiNative.BucketSettings();
-            mChannelCollection.fillBucketSettings(bucketSettings, 2);
-            assertThat(bucketSettings, bandIs(ALL_BANDS));
-            assertFalse(mChannelCollection.isAllChannels()); // can't determine from just channels
-        }
-    }
-}
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 3f53ce1ae..73ea14374 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
@@ -18,6 +18,7 @@ package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.NativeScanSettingsBuilder;
 import static com.android.server.wifi.ScanTestUtil.assertScanDataEquals;
+import static com.android.server.wifi.ScanTestUtil.setupMockChannels;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -71,6 +72,11 @@ public class WificondPnoScannerTest {
         mWifiMonitor = new MockWifiMonitor();
         mResources = new MockResources();
 
+        setupMockChannels(mWifiNative,
+                new int[]{2400, 2450},
+                new int[]{5150, 5175},
+                new int[]{5600, 5650});
+
         when(mWifiNative.getInterfaceName()).thenReturn("a_test_interface_name");
         when(mContext.getSystemService(Context.ALARM_SERVICE))
                 .thenReturn(mAlarmManager.getAlarmManager());
@@ -108,8 +114,8 @@ public class WificondPnoScannerTest {
         WifiNative.PnoEventHandler pnoEventHandler = mock(WifiNative.PnoEventHandler.class);
         WifiNative.PnoSettings pnoSettings = createDummyPnoSettings(false);
         WifiNative.ScanEventHandler eventHandler = mock(WifiNative.ScanEventHandler.class);
-        WifiNative.ScanSettings settings = createDummyScanSettings();
-        ScanResults scanResults = createDummyScanResults(true);
+        WifiNative.ScanSettings settings = createDummyScanSettings(false);
+        ScanResults scanResults = createDummyScanResults(false);
 
         InOrder order = inOrder(eventHandler, mWifiNative);
         // Start PNO scan
@@ -147,8 +153,8 @@ public class WificondPnoScannerTest {
         WifiNative.PnoEventHandler pnoEventHandler = mock(WifiNative.PnoEventHandler.class);
         WifiNative.PnoSettings pnoSettings = createDummyPnoSettings(false);
         WifiNative.ScanEventHandler eventHandler = mock(WifiNative.ScanEventHandler.class);
-        WifiNative.ScanSettings settings = createDummyScanSettings();
-        ScanResults scanResults = createDummyScanResults(true);
+        WifiNative.ScanSettings settings = createDummyScanSettings(false);
+        ScanResults scanResults = createDummyScanResults(false);
 
         InOrder order = inOrder(eventHandler, mWifiNative);
         // Start PNO scan
@@ -298,7 +304,7 @@ public class WificondPnoScannerTest {
     private void createScannerWithHwPnoScanSupport() {
         mResources.setBoolean(R.bool.config_wifi_background_scan_support, true);
         mScanner = new WificondScannerImpl(mContext, mWifiNative, mWifiMonitor,
-                mLooper.getLooper(), mClock);
+                new WificondChannelHelper(mWifiNative), mLooper.getLooper(), mClock);
     }
 
     private WifiNative.PnoNetwork createDummyPnoNetwork(String ssid) {
@@ -316,12 +322,15 @@ public class WificondPnoScannerTest {
         return pnoSettings;
     }
 
-    private WifiNative.ScanSettings createDummyScanSettings() {
+    private WifiNative.ScanSettings createDummyScanSettings(boolean allChannelsScanned) {
         WifiNative.ScanSettings settings = new NativeScanSettingsBuilder()
                 .withBasePeriod(10000)
                 .withMaxApPerScan(10)
-                .addBucketWithBand(10000, WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN,
-                        WifiScanner.WIFI_BAND_24_GHZ)
+                .addBucketWithBand(
+                    10000,
+                    WifiScanner.REPORT_EVENT_AFTER_EACH_SCAN,
+                    allChannelsScanned
+                            ? WifiScanner.WIFI_BAND_BOTH_WITH_DFS : WifiScanner.WIFI_BAND_24_GHZ)
                 .build();
         return settings;
     }
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 982f16d66..3657e5056 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondScannerTest.java
@@ -17,6 +17,7 @@
 package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.NativeScanSettingsBuilder;
+import static com.android.server.wifi.ScanTestUtil.setupMockChannels;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -44,8 +45,12 @@ public class WificondScannerTest extends BaseWifiScannerImplTest {
 
     @Before
     public void setup() throws Exception {
+        setupMockChannels(mWifiNative,
+                new int[]{2400, 2450},
+                new int[]{5150, 5175},
+                new int[]{5600, 5650});
         mScanner = new WificondScannerImpl(mContext, mWifiNative, mWifiMonitor,
-                mLooper.getLooper(), mClock);
+                new WificondChannelHelper(mWifiNative), mLooper.getLooper(), mClock);
     }
 
     /**