Merge "WifiStateMachine: Shutdown IpClient when exiting client mode" into pi-dev

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 1907c56b7..6fa9a2ff6 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -2451,4 +2451,16 @@ public class WifiStateMachineTest {
         mWsm.setWifiStateForApiCalls(invalidStatePositive);
         assertEquals(WifiManager.WIFI_STATE_DISABLED, mWsm.syncGetWifiState());
     }
+
+    /**
+     * Verify that IPClient instance is shutdown when wifi is disabled.
+     */
+    @Test
+    public void verifyIpClientShutdownWhenDisabled() throws Exception {
+        loadComponentsInStaMode();
+
+        mWsm.setOperationalMode(WifiStateMachine.DISABLED_MODE, null);
+        mLooper.dispatchAll();
+        verify(mIpClient).shutdown();
+    }
 }