14 files changed, 89 insertions, 58 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;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScannerTest.java b/tests/wifitests/src/android/net/wifi/WifiScannerTest.java
index 34140b521..b68d52721 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScannerTest.java
+++ b/tests/wifitests/src/android/net/wifi/WifiScannerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server.wifi;
+package android.net.wifi;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyString;
@@ -26,14 +26,15 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.wifi.IWifiScanner;
-import android.net.wifi.WifiScanner;
 import android.net.wifi.WifiScanner.BssidInfo;
 import android.net.wifi.WifiScanner.BssidListener;
 import android.os.Handler;
 import android.os.Message;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.server.wifi.BidirectionalAsyncChannelServer;
+import com.android.server.wifi.MockLooper;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +43,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Unit tests for {@link WifiScanner}.
+ * Unit tests for {@link android.net.wifi.WifiScanner}.
  */
 @SmallTest
 public class WifiScannerTest {
diff --git a/tests/wifitests/src/com/android/server/wifi/MockResources.java b/tests/wifitests/src/com/android/server/wifi/MockResources.java
index 2ce7300f4..ab40c6f8d 100644
--- a/tests/wifitests/src/com/android/server/wifi/MockResources.java
+++ b/tests/wifitests/src/com/android/server/wifi/MockResources.java
@@ -1,15 +1,30 @@
+/*
+ * 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;
 
 import java.util.HashMap;
 
-class MockResources extends android.test.mock.MockResources {
+public class MockResources extends android.test.mock.MockResources {
 
     private HashMap<Integer, Boolean> mBooleanValues;
     private HashMap<Integer, Integer> mIntegerValues;
     private HashMap<Integer, String>  mStringValues;
 
-    MockResources() {
+    public MockResources() {
         mBooleanValues = new HashMap<Integer, Boolean>();
         mIntegerValues = new HashMap<Integer, Integer>();
         mStringValues  = new HashMap<Integer, String>();
diff --git a/tests/wifitests/src/com/android/server/wifi/ScanTestUtil.java b/tests/wifitests/src/com/android/server/wifi/ScanTestUtil.java
index 9b27c48f7..8228118d8 100644
--- a/tests/wifitests/src/com/android/server/wifi/ScanTestUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/ScanTestUtil.java
@@ -11,7 +11,7 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.server.wifi;
@@ -29,7 +29,6 @@ import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -39,12 +38,6 @@ import java.util.Set;
  */
 public class ScanTestUtil {
 
-    public static void installWlanWifiNative(WifiNative wifiNative) throws Exception {
-        Field field = WifiNative.class.getDeclaredField("wlanNativeInterface");
-        field.setAccessible(true);
-        field.set(null, wifiNative);
-    }
-
     public static void setupMockChannels(WifiNative wifiNative, int[] channels24, int[] channels5,
             int[] channelsDfs) throws Exception {
         when(wifiNative.getChannelsForBand(WifiScanner.WIFI_BAND_24_GHZ))
diff --git a/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
index bfb4739be..04684d932 100644
--- a/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java
@@ -11,23 +11,17 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.server.wifi;
+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.createFreqSet;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import android.content.Context;
 import android.net.wifi.ScanResult;
@@ -36,6 +30,14 @@ import android.net.wifi.WifiScanner.ScanData;
 import android.net.wifi.WifiSsid;
 import android.os.SystemClock;
 
+import com.android.server.wifi.MockAlarmManager;
+import com.android.server.wifi.MockLooper;
+import com.android.server.wifi.MockResources;
+import com.android.server.wifi.MockWifiMonitor;
+import com.android.server.wifi.ScanDetail;
+import com.android.server.wifi.ScanResults;
+import com.android.server.wifi.WifiMonitor;
+import com.android.server.wifi.WifiNative;
 import com.android.server.wifi.scanner.ChannelHelper.ChannelCollection;
 
 import org.junit.Before;
@@ -52,7 +54,7 @@ import java.util.Set;
 
 /**
  * Base unit tests that should pass for all implementations of
- * {@link com.android.server.wifi.WifiScannerImpl}.
+ * {@link com.android.server.wifi.scanner.WifiScannerImpl}.
  */
 public abstract class BaseWifiScannerImplTest {
     @Mock Context mContext;
diff --git a/tests/wifitests/src/com/android/server/wifi/HalWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java
index 338599d16..7da2bad90 100644
--- a/tests/wifitests/src/com/android/server/wifi/HalWifiScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java
@@ -11,10 +11,10 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.setupMockChannels;
 
@@ -23,7 +23,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.junit.Before;
 
 /**
- * Unit tests for {@link com.android.server.wifi.HalWifiScannerImpl}.
+ * Unit tests for {@link com.android.server.wifi.scanner.HalWifiScannerImpl}.
  */
 @SmallTest
 public class HalWifiScannerTest extends BaseWifiScannerImplTest {
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantPnoScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java
index 8586b1c93..4ef8a3f8d 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantPnoScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java
@@ -11,10 +11,10 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.NativeScanSettingsBuilder;
 import static com.android.server.wifi.ScanTestUtil.assertScanDataEquals;
@@ -28,6 +28,13 @@ import android.net.wifi.WifiScanner;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.internal.R;
+import com.android.server.wifi.MockAlarmManager;
+import com.android.server.wifi.MockLooper;
+import com.android.server.wifi.MockResources;
+import com.android.server.wifi.MockWifiMonitor;
+import com.android.server.wifi.ScanResults;
+import com.android.server.wifi.WifiMonitor;
+import com.android.server.wifi.WifiNative;
 import com.android.server.wifi.scanner.ChannelHelper.ChannelCollection;
 
 import org.junit.Before;
@@ -41,7 +48,7 @@ import java.util.Set;
 
 
 /**
- * Unit tests for {@link com.android.server.wifi.SupplicantWifiScannerImpl.setPnoList}.
+ * Unit tests for {@link com.android.server.wifi.scanner.SupplicantWifiScannerImpl.setPnoList}.
  */
 @SmallTest
 public class SupplicantPnoScannerTest {
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java
index 6a39233eb..b107f8124 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java
@@ -11,10 +11,10 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.NativeScanSettingsBuilder;
 import static com.android.server.wifi.ScanTestUtil.assertScanDatasEquals;
@@ -28,6 +28,11 @@ import android.net.wifi.WifiScanner;
 import android.net.wifi.WifiSsid;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.server.wifi.ScanDetail;
+import com.android.server.wifi.ScanResults;
+import com.android.server.wifi.WifiMonitor;
+import com.android.server.wifi.WifiNative;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -37,7 +42,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * Unit tests for {@link com.android.server.wifi.SupplicantWifiScannerImpl}.
+ * Unit tests for {@link com.android.server.wifi.scanner.SupplicantWifiScannerImpl}.
  */
 @SmallTest
 public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
index f0b2f60b9..4fe7d53da 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiScanningServiceTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java
@@ -11,10 +11,10 @@
  * 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
+ * limitations under the License.
  */
 
-package com.android.server.wifi;
+package com.android.server.wifi.scanner;
 
 import static com.android.server.wifi.ScanTestUtil.*;
 
@@ -37,10 +37,16 @@ import android.util.Pair;
 
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.util.Protocol;
+import com.android.server.wifi.BidirectionalAsyncChannel;
+import com.android.server.wifi.MockAlarmManager;
 import com.android.server.wifi.MockAnswerUtil.AnswerWithArguments;
-import com.android.server.wifi.scanner.BackgroundScanScheduler;
-import com.android.server.wifi.scanner.ChannelHelper;
-import com.android.server.wifi.scanner.PresetKnownBandsChannelHelper;
+import com.android.server.wifi.MockLooper;
+import com.android.server.wifi.ScanResults;
+import com.android.server.wifi.TestUtil;
+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 org.junit.After;
 import org.junit.Before;
@@ -56,7 +62,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 /**
- * Unit tests for {@link com.android.server.wifi.WifiScanningServiceImpl}.
+ * Unit tests for {@link com.android.server.wifi.scanner.WifiScanningServiceImpl}.
  */
 @SmallTest
 public class WifiScanningServiceTest {
@@ -826,7 +832,7 @@ public class WifiScanningServiceTest {
             Message networkFoundMessage) {
         assertEquals("what", WifiScanner.CMD_PNO_NETWORK_FOUND, networkFoundMessage.what);
         assertEquals("listenerId", listenerId, networkFoundMessage.arg2);
-        ScanTestUtil.assertScanResultsEquals(expected,
+        assertScanResultsEquals(expected,
                 ((WifiScanner.ParcelableScanResults) networkFoundMessage.obj).getResults());
     }