Merge "Remove unused supplicant scan with connection setup option" into mm-wireless-dev

7 files changed, 44 insertions, 58 deletions

diff --git a/service/java/com/android/server/wifi/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/HalWifiScannerImpl.java
index fc5d18f4a..908387f9e 100644
--- a/service/java/com/android/server/wifi/HalWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/HalWifiScannerImpl.java
@@ -116,7 +116,7 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb
         }
 
         mSingleScanEventHandler = eventHandler;
-        if (!mWifiNative.scan(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, freqs)) {
+        if (!mWifiNative.scan(freqs)) {
             mSingleScanEventHandler = null;
             // TODO call on failure callback in handler
         }
diff --git a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
index 78e213797..aa0def9e0 100644
--- a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
@@ -358,8 +358,7 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle
             }
 
             if (freqs.size() > 0) {
-                boolean success = mWifiNative.scan(
-                        WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, freqs);
+                boolean success = mWifiNative.scan(freqs);
                 if (success) {
                     // TODO handle scan timeout
                     Log.d(TAG, "Starting wifi scan for " + freqs.size() + " freqs"
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index de0a6a3a7..20f5ab3c7 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -327,38 +327,34 @@ public class WifiNative {
     }
 
 
-    public static final int SCAN_WITHOUT_CONNECTION_SETUP          = 1;
-    public static final int SCAN_WITH_CONNECTION_SETUP             = 2;
-
-    public boolean scan(int type, Set<Integer> freqs) {
-        if(freqs == null) {
-            return scan(type, (String)null);
-        }
-        else if (freqs.size() != 0) {
+    /**
+     * Start a scan using wpa_supplicant for the given frequencies.
+     * If freqs is null then all supported channels are scanned.
+     */
+    public boolean scan(Set<Integer> freqs) {
+        if (freqs == null) {
+            return scanFrequencyList(null);
+        } else if (freqs.size() != 0) {
             StringBuilder freqList = new StringBuilder();
             boolean first = true;
             for (Integer freq : freqs) {
-                if (!first)
+                if (!first) {
                     freqList.append(",");
+                }
                 freqList.append(freq.toString());
                 first = false;
             }
-            return scan(type, freqList.toString());
-        }
-        else {
+            return scanFrequencyList(freqList.toString());
+        } else {
             return false;
         }
     }
 
-    private boolean scan(int type, String freqList) {
-        if (type == SCAN_WITHOUT_CONNECTION_SETUP) {
-            if (freqList == null) return doBooleanCommand("SCAN TYPE=ONLY");
-            else return doBooleanCommand("SCAN TYPE=ONLY freq=" + freqList);
-        } else if (type == SCAN_WITH_CONNECTION_SETUP) {
-            if (freqList == null) return doBooleanCommand("SCAN");
-            else return doBooleanCommand("SCAN freq=" + freqList);
+    private boolean scanFrequencyList(String freqList) {
+        if (freqList == null) {
+            return doBooleanCommand("SCAN TYPE=ONLY");
         } else {
-            throw new IllegalArgumentException("Invalid scan type");
+            return doBooleanCommand("SCAN TYPE=ONLY freq=" + freqList);
         }
     }
 
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 990b59c42..f600f308f 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2041,7 +2041,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
     }
 
-    private void handleScanRequest(int type, Message message) {
+    private void handleScanRequest(Message message) {
         ScanSettings settings = null;
         WorkSource workSource = null;
 
@@ -2062,7 +2062,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
         }
 
         // call wifi native to start the scan
-        if (startScanNative(type, freqs)) {
+        if (startScanNative(freqs)) {
             // only count battery consumption if scan request is accepted
             noteScanStart(message.arg1, workSource);
             // a full scan covers everything, clearing scan request buffer
@@ -2116,8 +2116,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
     /**
      * return true iff scan request is accepted
      */
-    private boolean startScanNative(int type, Set<Integer> freqs) {
-        if (mWifiNative.scan(type, freqs)) {
+    private boolean startScanNative(Set<Integer> freqs) {
+        if (mWifiNative.scan(freqs)) {
             mIsScanOngoing = true;
             mIsFullScanOngoing = (freqs == null);
             lastScanFreqs = freqs;
@@ -6204,7 +6204,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
 
             switch(message.what) {
                 case CMD_START_SCAN:
-                    handleScanRequest(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
+                    handleScanRequest(message);
                     break;
                 case CMD_SET_FREQUENCY_BAND:
                     int band =  message.arg1;
@@ -6216,8 +6216,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                         mFrequencyBand.set(band);
                         // Flush old data - like scan results
                         mWifiNative.bssFlush();
-                        // Fetch the latest scan results when frequency band is set
-//                        startScanNative(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, null);
 
                         if (PDBG)  logd("done set frequency band " + band);
 
@@ -6490,7 +6488,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                 // Handle scan. All the connection related commands are
                 // handled only in ConnectModeState
                 case CMD_START_SCAN:
-                    handleScanRequest(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
+                    handleScanRequest(message);
                     break;
                 case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
                     SupplicantState state = handleSupplicantStateChange(message);
@@ -8065,8 +8063,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
             logd("starting scan for " + config.configKey() + " with " + freqs);
             //}
             // Call wifi native to start the scan
-            if (startScanNative(
-                    WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, freqs)) {
+            if (startScanNative(freqs)) {
                 // Only count battery consumption if scan request is accepted
                 noteScanStart(SCAN_ALARM_SOURCE, null);
                 messageHandlingStatus = MESSAGE_HANDLING_STATUS_OK;
@@ -8371,8 +8368,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                                         + fullBandConnectedTimeIntervalMilli);
                                     }
                                 }
-                                handleScanRequest(
-                                        WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
+                                handleScanRequest(message);
                             } else {
                                 if (!startScanForConfiguration(
                                         currentConfiguration, restrictChannelList)) {
@@ -8393,8 +8389,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                                                     + fullBandConnectedTimeIntervalMilli);
                                         }
                                     }
-                                    handleScanRequest(
-                                                WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
+                                    handleScanRequest(message);
                                 }
                             }
 
@@ -9325,7 +9320,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
                         }
                         /* Disable background scan temporarily during a regular scan */
                         enableBackgroundScan(false);
-                        handleScanRequest(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
+                        handleScanRequest(message);
                         ret = HANDLED;
                     } else {
 
diff --git a/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java b/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java
index 0ff439152..af4c9340a 100644
--- a/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/BaseWifiScannerImplTest.java
@@ -25,7 +25,6 @@ import static com.android.server.wifi.ScanTestUtil.setupMockChannels;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -140,7 +139,7 @@ public abstract class BaseWifiScannerImplTest {
         WifiNative.ScanEventHandler eventHandler2 = mock(WifiNative.ScanEventHandler.class);
 
         // scan start succeeds
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         assertTrue(mScanner.startSingleScan(settings, eventHandler));
         assertFalse("second scan while first scan running should fail immediately",
@@ -164,7 +163,7 @@ public abstract class BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scan fails
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(false);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(false);
 
         // start scan
         assertTrue(mScanner.startSingleScan(settings, eventHandler));
@@ -213,7 +212,7 @@ public abstract class BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scans succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // start first scan
         assertTrue(mScanner.startSingleScan(settings, eventHandler));
@@ -257,7 +256,7 @@ public abstract class BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // scan succeeds
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // start scan
         assertTrue(mScanner.startSingleScan(settings, eventHandler));
@@ -270,8 +269,7 @@ public abstract class BaseWifiScannerImplTest {
     protected void expectSuccessfulSingleScan(InOrder order,
             WifiNative.ScanEventHandler eventHandler, Set<Integer> expectedScan,
             ScanResults results, boolean expectFullResults) {
-        order.verify(mWifiNative).scan(eq(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP),
-                eq(expectedScan));
+        order.verify(mWifiNative).scan(eq(expectedScan));
 
         when(mWifiNative.getScanResults()).thenReturn(results.getScanDetailArrayList());
 
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java
index b08e52dc8..ef5291b58 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantWifiScannerTest.java
@@ -22,7 +22,6 @@ import static com.android.server.wifi.ScanTestUtil.createFreqSet;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -332,7 +331,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scans fail
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(false);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(false);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -367,7 +366,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scan starts succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -412,7 +411,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scan starts succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -467,7 +466,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scan starts succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -477,8 +476,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         // alarm for next period
         assertEquals(1, mAlarmManager.getPendingCount());
 
-        order.verify(mWifiNative).scan(eq(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP),
-                eq(expectedPeriods[0].getScanFreqs()));
+        order.verify(mWifiNative).scan(eq(expectedPeriods[0].getScanFreqs()));
 
         mScanner.pauseBatchedScan();
 
@@ -544,7 +542,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scan starts succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -583,7 +581,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
         InOrder order = inOrder(eventHandler, mWifiNative);
 
         // All scans succeed
-        when(mWifiNative.scan(anyInt(), any(Set.class))).thenReturn(true);
+        when(mWifiNative.scan(any(Set.class))).thenReturn(true);
 
         // Start scan
         mScanner.startBatchedScan(settings, eventHandler);
@@ -643,7 +641,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
             ArrayList<ScanDetail> nativeResults, WifiScanner.ScanData[] expectedScanResults,
             ScanResult[] fullResults, int periodId) {
         // Verify scan started
-        order.verify(mWifiNative).scan(eq(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP), eq(scanFreqs));
+        order.verify(mWifiNative).scan(eq(scanFreqs));
 
         // Setup scan results
         when(mWifiNative.getScanResults()).thenReturn(nativeResults);
@@ -669,13 +667,13 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest {
     private void expectFailedScanStart(InOrder order, WifiNative.ScanEventHandler eventHandler,
             Set<Integer> scanFreqs) {
         // Verify scan started
-        order.verify(mWifiNative).scan(eq(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP), eq(scanFreqs));
+        order.verify(mWifiNative).scan(eq(scanFreqs));
     }
 
     private void expectFailedEventScan(InOrder order, WifiNative.ScanEventHandler eventHandler,
             Set<Integer> scanFreqs) {
         // Verify scan started
-        order.verify(mWifiNative).scan(eq(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP), eq(scanFreqs));
+        order.verify(mWifiNative).scan(eq(scanFreqs));
 
         // Notify scan has failed
         mWifiMonitor.sendMessage(mWifiNative.getInterfaceName(), WifiMonitor.SCAN_FAILED_EVENT);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 683d35689..9878ea72e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -511,7 +511,7 @@ public class WifiStateMachineTest {
         mWsm.startScan(-1, 0, null, null);
         wait(200);
 
-        verify(mWifiNative).scan(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, null);
+        verify(mWifiNative).scan(null);
 
         when(mWifiNative.getScanResults()).thenReturn(getMockScanResults());
         mWsm.sendMessage(WifiMonitor.SCAN_RESULTS_EVENT);