6 files changed, 19 insertions, 17 deletions
diff --git a/service/java/com/android/server/wifi/WifiScanningScheduler.java b/service/java/com/android/server/wifi/WifiScanningScheduler.java
deleted file mode 100644
index e69de29bb..000000000
--- a/service/java/com/android/server/wifi/WifiScanningScheduler.java
+++ /dev/null
diff --git a/service/java/com/android/server/wifi/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java
index 24942ad3c..18f159f7f 100644
--- a/service/java/com/android/server/wifi/HalWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java
@@ -14,23 +14,21 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import android.content.Context;
-import android.net.wifi.WifiManager;
 import android.net.wifi.WifiScanner;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 
-import com.android.server.wifi.scanner.ChannelHelper;
-import com.android.server.wifi.scanner.HalChannelHelper;
+import com.android.server.wifi.WifiNative;
 
 /**
  * WifiScanner implementation that takes advantage of the gscan HAL API
  * The gscan API is used to perform background scans and wpa_supplicant is used for onehot scans.
- * @see com.android.server.wifi.WifiScannerImpl for more details on each method
+ * @see com.android.server.wifi.scanner.WifiScannerImpl for more details on each method.
  */
 public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callback {
     private static final String TAG = "HalWifiScannerImpl";
diff --git a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java
index 1eb7d4b2b..0ef36f565 100644
--- a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/scanner/SupplicantWifiScannerImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import android.app.AlarmManager;
 import android.content.Context;
@@ -28,9 +28,10 @@ import android.os.SystemClock;
 import android.util.Log;
 
 import com.android.internal.R;
-import com.android.server.wifi.scanner.ChannelHelper;
+import com.android.server.wifi.ScanDetail;
+import com.android.server.wifi.WifiMonitor;
+import com.android.server.wifi.WifiNative;
 import com.android.server.wifi.scanner.ChannelHelper.ChannelCollection;
-import com.android.server.wifi.scanner.NoBandChannelHelper;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ import java.util.Set;
 
 /**
  * Implementation of the WifiScanner HAL API that uses wpa_supplicant to perform all scans
- * @see com.android.server.wifi.WifiScannerImpl for more details on each method
+ * @see com.android.server.wifi.scanner.WifiScannerImpl for more details on each method.
  */
 public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handler.Callback {
     private static final String TAG = "SupplicantWifiScannerImpl";
diff --git a/service/java/com/android/server/wifi/WifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java
index 5ade2a73e..66c3eda6f 100644
--- a/service/java/com/android/server/wifi/WifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import android.content.Context;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiScanner;
 import android.os.Looper;
 
-import com.android.server.wifi.scanner.ChannelHelper;
+import com.android.server.wifi.WifiNative;
 
 import java.util.Comparator;
 
@@ -31,7 +31,7 @@ import java.util.Comparator;
 public abstract class WifiScannerImpl {
 
     /**
-     * A factory that create a {@link com.android.server.wifi.WifiScannerImpl}
+     * A factory that create a {@link com.android.server.wifi.scanner.WifiScannerImpl}
      */
     public static interface WifiScannerImplFactory {
         WifiScannerImpl create(Context context, Looper looper);
diff --git a/service/java/com/android/server/wifi/WifiScanningService.java b/service/java/com/android/server/wifi/scanner/WifiScanningService.java
index f07954deb..93ac72252 100644
--- a/service/java/com/android/server/wifi/WifiScanningService.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import android.content.Context;
 import android.os.HandlerThread;
@@ -22,6 +22,7 @@ import android.util.Log;
 
 import com.android.server.SystemService;
 import com.android.server.am.BatteryStatsService;
+import com.android.server.wifi.WifiInjector;
 
 public class WifiScanningService extends SystemService {
 
diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
index 066729818..524b76dd7 100644
--- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import android.Manifest;
 import android.app.AlarmManager;
@@ -51,10 +51,12 @@ import com.android.internal.util.AsyncChannel;
 import com.android.internal.util.Protocol;
 import com.android.internal.util.State;
 import com.android.internal.util.StateMachine;
-import com.android.server.wifi.scanner.BackgroundScanScheduler;
-import com.android.server.wifi.scanner.ChannelHelper;
+import com.android.server.wifi.WifiInjector;
+import com.android.server.wifi.WifiMetrics;
+import com.android.server.wifi.WifiMetricsProto;
+import com.android.server.wifi.WifiNative;
+import com.android.server.wifi.WifiStateMachine;
 import com.android.server.wifi.scanner.ChannelHelper.ChannelCollection;
-import com.android.server.wifi.scanner.ScanScheduleUtil;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;