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, 10 insertions, 10 deletions

diff --git a/service/java/com/android/server/wifi/scanner/ChannelHelper.java b/service/java/com/android/server/wifi/scanner/ChannelHelper.java
index acb0ac820..d87df072f 100644
--- a/service/java/com/android/server/wifi/scanner/ChannelHelper.java
+++ b/service/java/com/android/server/wifi/scanner/ChannelHelper.java
@@ -222,10 +222,10 @@ public abstract class ChannelHelper {
         public abstract void fillBucketSettings(WifiNative.BucketSettings bucket, int maxChannels);
 
         /**
-         * Gets the list of channels that should be supplied to supplicant for a scan. Will either
-         * be a collection of all channels or null if all channels should be scanned.
+         * Gets the list of channels scan. Will either be a collection of all channels or null
+         * if all channels should be scanned.
          */
-        public abstract Set<Integer> getSupplicantScanFreqs();
+        public abstract Set<Integer> getScanFreqs();
     }
 
 
diff --git a/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java b/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
index acddc26c6..33cce1c08 100644
--- a/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
+++ b/service/java/com/android/server/wifi/scanner/KnownBandsChannelHelper.java
@@ -263,7 +263,7 @@ public class KnownBandsChannelHelper extends ChannelHelper {
         }
 
         @Override
-        public Set<Integer> getSupplicantScanFreqs() {
+        public Set<Integer> getScanFreqs() {
             if (mExactBands == WifiScanner.WIFI_BAND_BOTH_WITH_DFS) {
                 return null;
             } else {
diff --git a/service/java/com/android/server/wifi/scanner/NoBandChannelHelper.java b/service/java/com/android/server/wifi/scanner/NoBandChannelHelper.java
index 4f8373b30..b2eeada71 100644
--- a/service/java/com/android/server/wifi/scanner/NoBandChannelHelper.java
+++ b/service/java/com/android/server/wifi/scanner/NoBandChannelHelper.java
@@ -100,7 +100,7 @@ public class NoBandChannelHelper extends ChannelHelper {
 
         @Override
         public boolean partiallyContainsBand(int band) {
-            // We don't need to partially collapse settings in supplicant scanner because we
+            // We don't need to partially collapse settings in wificond scanner because we
             // don't have any limitation on the number of channels that can be scanned. We also
             // don't currently keep track of bands very well in NoBandChannelHelper.
             return false;
@@ -124,7 +124,7 @@ public class NoBandChannelHelper extends ChannelHelper {
 
         @Override
         public Set<Integer> getMissingChannelsFromBand(int band) {
-            // We don't need to partially collapse settings in supplicant scanner because we
+            // We don't need to partially collapse settings in wificond scanner because we
             // don't have any limitation on the number of channels that can be scanned. We also
             // don't currently keep track of bands very well in NoBandChannelHelper.
             return new ArraySet<Integer>();
@@ -132,7 +132,7 @@ public class NoBandChannelHelper extends ChannelHelper {
 
         @Override
         public Set<Integer> getContainingChannelsFromBand(int band) {
-            // We don't need to partially collapse settings in supplicant scanner because we
+            // We don't need to partially collapse settings in wificond scanner because we
             // don't have any limitation on the number of channels that can be scanned. We also
             // don't currently keep track of bands very well in NoBandChannelHelper.
             return new ArraySet<Integer>();
@@ -166,7 +166,7 @@ public class NoBandChannelHelper extends ChannelHelper {
         }
 
         @Override
-        public Set<Integer> getSupplicantScanFreqs() {
+        public Set<Integer> getScanFreqs() {
             if (mAllChannels) {
                 return null;
             } else {
diff --git a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
index 590542b41..b088cc01d 100644
--- a/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WificondScannerImpl.java
@@ -148,7 +148,7 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
 
     public WificondScannerImpl(Context context, WifiNative wifiNative,
                                      WifiMonitor wifiMonitor, Looper looper, Clock clock) {
-        // TODO figure out how to get channel information from supplicant
+        // TODO get channel information from wificond.
         this(context, wifiNative, wifiMonitor, new NoBandChannelHelper(), looper, clock);
     }
 
@@ -422,7 +422,7 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
             if ((newScanSettings.backgroundScanActive || newScanSettings.singleScanActive)
                     && !allFreqs.isEmpty()) {
                 pauseHwPnoScan();
-                Set<Integer> freqs = allFreqs.getSupplicantScanFreqs();
+                Set<Integer> freqs = allFreqs.getScanFreqs();
                 boolean success = mWifiNative.scan(freqs, hiddenNetworkSSIDSet);
                 if (success) {
                     // TODO handle scan timeout