Rename ChannelHelper.getSupplicantScanFreqs()

We no longer use supplicant for scanning, so we need
to rename this helper function.
Since this helper function is not specifically for supplicant,
this CL just removes the 'Supplicant' part in its name.

This also fixes a few comments related to supplicant.

Bug: 36031295
Test: compile, unit tests, manual tests
Change-Id: Iabbf20e07b52ea015db227984511affaa055f205

4 files changed, 19 insertions, 19 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 8b92ca1c1..60e525657 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
@@ -98,7 +98,7 @@ public abstract class BaseWifiScannerImplTest {
     protected Set<Integer> expectedBandScanFreqs(int band) {
         ChannelCollection collection = mScanner.getChannelHelper().createChannelCollection();
         collection.addBand(band);
-        return collection.getSupplicantScanFreqs();
+        return collection.getScanFreqs();
     }
 
     protected Set<Integer> expectedBandAndChannelScanFreqs(int band, int... channels) {
@@ -107,7 +107,7 @@ public abstract class BaseWifiScannerImplTest {
         for (int channel : channels) {
             collection.addChannel(channel);
         }
-        return collection.getSupplicantScanFreqs();
+        return collection.getScanFreqs();
     }
 
     @Test
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 3e482a9fe..de3f7ff45 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/KnownBandsChannelHelperTest.java
@@ -285,7 +285,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, channelsAre());
 
             assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertTrue(mChannelCollection.isEmpty());
             assertFalse(mChannelCollection.containsChannel(2400));
@@ -306,7 +306,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, channelsAre());
 
             assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertTrue(mChannelCollection.isEmpty());
             assertFalse(mChannelCollection.containsChannel(2400));
@@ -326,7 +326,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, bandIs(WifiScanner.WIFI_BAND_24_GHZ));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -346,7 +346,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, channelsAre(2400));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -367,7 +367,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, channelsAre(2400, 2450));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -388,7 +388,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, bandIs(WifiScanner.WIFI_BAND_24_GHZ));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -409,7 +409,7 @@ public class KnownBandsChannelHelperTest {
             assertThat(bucketSettings, channelsAre(2400, 2450, 5150));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450, 5150)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -429,7 +429,7 @@ public class KnownBandsChannelHelperTest {
             mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
             assertThat(bucketSettings, bandIs(WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
 
-            assertNull(mChannelCollection.getSupplicantScanFreqs());
+            assertNull(mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java
index 2863b9f90..145b2143c 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/NoBandChannelHelperTest.java
@@ -221,7 +221,7 @@ public class NoBandChannelHelperTest {
             assertThat(bucketSettings, channelsAre());
 
             assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertTrue(mChannelCollection.isEmpty());
             assertFalse(mChannelCollection.containsChannel(2400));
@@ -241,7 +241,7 @@ public class NoBandChannelHelperTest {
             assertThat(bucketSettings, channelsAre());
 
             assertEquals(Collections.<Integer>emptySet(),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertTrue(mChannelCollection.isEmpty());
             assertFalse(mChannelCollection.containsChannel(2400));
@@ -259,7 +259,7 @@ public class NoBandChannelHelperTest {
             mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
             assertThat(bucketSettings, bandIs(ALL_BANDS));
 
-            assertNull(mChannelCollection.getSupplicantScanFreqs());
+            assertNull(mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -279,7 +279,7 @@ public class NoBandChannelHelperTest {
             assertThat(bucketSettings, channelsAre(2400));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -300,7 +300,7 @@ public class NoBandChannelHelperTest {
             assertThat(bucketSettings, channelsAre(2400, 2450));
 
             assertEquals(new HashSet<Integer>(Arrays.asList(2400, 2450)),
-                    mChannelCollection.getSupplicantScanFreqs());
+                    mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -320,7 +320,7 @@ public class NoBandChannelHelperTest {
             mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
             assertThat(bucketSettings, bandIs(ALL_BANDS));
 
-            assertNull(mChannelCollection.getSupplicantScanFreqs());
+            assertNull(mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -340,7 +340,7 @@ public class NoBandChannelHelperTest {
             mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
             assertThat(bucketSettings, bandIs(ALL_BANDS));
 
-            assertNull(mChannelCollection.getSupplicantScanFreqs());
+            assertNull(mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
@@ -360,7 +360,7 @@ public class NoBandChannelHelperTest {
             mChannelCollection.fillBucketSettings(bucketSettings, Integer.MAX_VALUE);
             assertThat(bucketSettings, bandIs(WifiScanner.WIFI_BAND_BOTH_WITH_DFS));
 
-            assertNull(mChannelCollection.getSupplicantScanFreqs());
+            assertNull(mChannelCollection.getScanFreqs());
 
             assertFalse(mChannelCollection.isEmpty());
             assertTrue(mChannelCollection.containsChannel(2400));
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 dde727f47..c63a9a042 100644
--- a/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WificondPnoScannerTest.java
@@ -406,7 +406,7 @@ public class WificondPnoScannerTest {
     private Set<Integer> expectedBandScanFreqs(int band) {
         ChannelCollection collection = mScanner.getChannelHelper().createChannelCollection();
         collection.addBand(band);
-        return collection.getSupplicantScanFreqs();
+        return collection.getScanFreqs();
     }
 
     /**