Merge "Don't manipulate driver state from WifiController"

2 files changed, 15 insertions, 18 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java
index 065ba9403..e69394897 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiControllerTest.java
@@ -268,7 +268,6 @@ public class WifiControllerTest {
         InOrder inOrder = inOrder(mWifiStateMachine);
         inOrder.verify(mWifiStateMachine).setSupplicantRunning(true);
         inOrder.verify(mWifiStateMachine).setOperationalMode(WifiStateMachine.CONNECT_MODE);
-        inOrder.verify(mWifiStateMachine).setDriverStart(true);
         assertEquals("DeviceActiveState", getCurrentState().getName());
     }
 
@@ -296,7 +295,6 @@ public class WifiControllerTest {
         InOrder inOrder = inOrder(mWifiStateMachine);
         inOrder.verify(mWifiStateMachine).setSupplicantRunning(true);
         inOrder.verify(mWifiStateMachine).setOperationalMode(WifiStateMachine.CONNECT_MODE);
-        inOrder.verify(mWifiStateMachine).setDriverStart(true);
         assertEquals("DeviceActiveState", getCurrentState().getName());
     }
 
@@ -330,7 +328,6 @@ public class WifiControllerTest {
         InOrder inOrder = inOrder(mWifiStateMachine);
         inOrder.verify(mWifiStateMachine).setSupplicantRunning(true);
         inOrder.verify(mWifiStateMachine).setOperationalMode(WifiStateMachine.CONNECT_MODE);
-        inOrder.verify(mWifiStateMachine).setDriverStart(true);
         assertEquals("FullLockHeldState", getCurrentState().getName());
     }
 
@@ -405,7 +402,6 @@ public class WifiControllerTest {
         inOrder.verify(mWifiStateMachine).setSupplicantRunning(false);
         inOrder.verify(mWifiStateMachine).setSupplicantRunning(true);
         inOrder.verify(mWifiStateMachine).setOperationalMode(WifiStateMachine.CONNECT_MODE);
-        inOrder.verify(mWifiStateMachine).setDriverStart(true);
         assertEquals("DeviceActiveState", getCurrentState().getName());
     }
 
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 0fa95383c..cc8adc6a2 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -519,31 +519,32 @@ public class WifiStateMachineTest {
         assertEquals("InitialState", getCurrentState().getName());
     }
 
-    /**
-     * Test to check that mode changes from WifiController will be properly handled in the
-     * InitialState by WifiStateMachine.
-     */
     @Test
-    public void checkOperationalModeInInitialState() throws Exception {
-        when(mWifiNative.startHal()).thenReturn(true);
-        when(mWifiNative.startSupplicant(anyBoolean())).thenReturn(true);
-
+    public void checkInitialStateStickyWhenDisabledMode() throws Exception {
         mLooper.dispatchAll();
         assertEquals("InitialState", getCurrentState().getName());
         assertEquals(WifiStateMachine.CONNECT_MODE, mWsm.getOperationalModeForTest());
 
-        mWsm.setOperationalMode(WifiStateMachine.SCAN_ONLY_WITH_WIFI_OFF_MODE);
+        mWsm.setOperationalMode(WifiStateMachine.DISABLED_MODE);
         mLooper.dispatchAll();
-        assertEquals(WifiStateMachine.SCAN_ONLY_WITH_WIFI_OFF_MODE,
-                mWsm.getOperationalModeForTest());
+        assertEquals(WifiStateMachine.DISABLED_MODE, mWsm.getOperationalModeForTest());
+        assertEquals("InitialState", getCurrentState().getName());
+    }
 
-        mWsm.setOperationalMode(WifiStateMachine.SCAN_ONLY_MODE);
+    @Test
+    public void shouldStartSupplicantWhenConnectModeRequested() throws Exception {
+        when(mWifiNative.startHal()).thenReturn(true);
+        when(mWifiNative.startSupplicant(anyBoolean())).thenReturn(true);
+
+        // The first time we start out in InitialState, we sit around here.
         mLooper.dispatchAll();
-        assertEquals(WifiStateMachine.SCAN_ONLY_MODE, mWsm.getOperationalModeForTest());
+        assertEquals("InitialState", getCurrentState().getName());
+        assertEquals(WifiStateMachine.CONNECT_MODE, mWsm.getOperationalModeForTest());
 
+        // But if someone tells us to enter connect mode, we start up supplicant
         mWsm.setOperationalMode(WifiStateMachine.CONNECT_MODE);
         mLooper.dispatchAll();
-        assertEquals(WifiStateMachine.CONNECT_MODE, mWsm.getOperationalModeForTest());
+        assertEquals("SupplicantStartingState", getCurrentState().getName());
     }
 
     /**