Merge "Update scan band channels when needed" into mm-wireless-dev

am: 25d25de358

* commit '25d25de358ece952e16420a89dd899ebed46f77a':
  Update scan band channels when needed

4 files changed, 10 insertions, 9 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerFilterTest.java b/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerFilterTest.java
index 8f6e8fbba..3c539ed8f 100644
--- a/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerFilterTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerFilterTest.java
@@ -34,7 +34,7 @@ import android.net.wifi.WifiScanner.ScanSettings;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.server.wifi.scanner.ChannelHelper;
-import com.android.server.wifi.scanner.KnownBandsChannelHelper;
+import com.android.server.wifi.scanner.PresetKnownBandsChannelHelper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -58,7 +58,7 @@ public class MultiClientSchedulerFilterTest {
 
     @Before
     public void setUp() throws Exception {
-        ChannelHelper channelHelper = new KnownBandsChannelHelper(
+        ChannelHelper channelHelper = new PresetKnownBandsChannelHelper(
                 new int[]{2400, 2450},
                 new int[]{5150, 5175},
                 new int[]{5600, 5650});
diff --git a/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerTest.java b/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerTest.java
index 45de55960..f0e8e95b8 100644
--- a/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/MultiClientSchedulerTest.java
@@ -31,6 +31,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import com.android.server.wifi.WifiNative.BucketSettings;
 import com.android.server.wifi.scanner.KnownBandsChannelHelper;
 import com.android.server.wifi.scanner.KnownBandsChannelHelper.KnownBandsChannelCollection;
+import com.android.server.wifi.scanner.PresetKnownBandsChannelHelper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -58,7 +59,7 @@ public class MultiClientSchedulerTest {
 
     @Before
     public void setUp() throws Exception {
-        mChannelHelper = new KnownBandsChannelHelper(
+        mChannelHelper = new PresetKnownBandsChannelHelper(
                 new int[]{2400, 2450},
                 new int[]{5150, 5175},
                 new int[]{5600, 5650, 5660});
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java
index 870455df9..853c895bd 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java
@@ -45,7 +45,7 @@ import com.android.internal.app.IBatteryStats;
 import com.android.internal.util.Protocol;
 import com.android.server.wifi.MockAnswerUtil.AnswerWithArguments;
 import com.android.server.wifi.scanner.ChannelHelper;
-import com.android.server.wifi.scanner.KnownBandsChannelHelper;
+import com.android.server.wifi.scanner.PresetKnownBandsChannelHelper;
 
 import org.junit.After;
 import org.junit.Before;
@@ -73,7 +73,7 @@ public class WifiScanningServiceTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
-        ChannelHelper channelHelper = new KnownBandsChannelHelper(
+        ChannelHelper channelHelper = new PresetKnownBandsChannelHelper(
                 new int[]{2400, 2450},
                 new int[]{5150, 5175},
                 new int[]{5600, 5650, 5660});
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java
index 550fe41f0..0fec0ff29 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java
@@ -65,7 +65,7 @@ public class KnownBandsChannelHelperTest {
          */
         @Before
         public void setUp() throws Exception {
-            mChannelHelper = new KnownBandsChannelHelper(
+            mChannelHelper = new PresetKnownBandsChannelHelper(
                     CHANNELS_24_GHZ,
                     CHANNELS_5_GHZ,
                     CHANNELS_DFS);
@@ -109,7 +109,7 @@ public class KnownBandsChannelHelperTest {
          */
         @Before
         public void setUp() throws Exception {
-            mChannelHelper = new KnownBandsChannelHelper(
+            mChannelHelper = new PresetKnownBandsChannelHelper(
                     CHANNELS_24_GHZ,
                     CHANNELS_5_GHZ,
                     CHANNELS_DFS);
@@ -191,7 +191,7 @@ public class KnownBandsChannelHelperTest {
          */
         @Before
         public void setUp() throws Exception {
-            mChannelHelper = new KnownBandsChannelHelper(
+            mChannelHelper = new PresetKnownBandsChannelHelper(
                     CHANNELS_24_GHZ,
                     CHANNELS_5_GHZ,
                     CHANNELS_DFS);
@@ -265,7 +265,7 @@ public class KnownBandsChannelHelperTest {
          */
         @Before
         public void setUp() throws Exception {
-            KnownBandsChannelHelper channelHelper = new KnownBandsChannelHelper(
+            KnownBandsChannelHelper channelHelper = new PresetKnownBandsChannelHelper(
                     CHANNELS_24_GHZ,
                     CHANNELS_5_GHZ,
                     CHANNELS_DFS);