diff options
| -rw-r--r-- | service/java/com/android/server/wifi/ActiveModeWarden.java | 14 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java | 16 |
2 files changed, 17 insertions, 13 deletions
diff --git a/service/java/com/android/server/wifi/ActiveModeWarden.java b/service/java/com/android/server/wifi/ActiveModeWarden.java index d118d833a..34ed21ef9 100644 --- a/service/java/com/android/server/wifi/ActiveModeWarden.java +++ b/service/java/com/android/server/wifi/ActiveModeWarden.java @@ -369,10 +369,10 @@ public class ActiveModeWarden { @Override public boolean processMessage(Message message) { - Log.d(TAG, "received a message in WifiDisabledState: " + message); if (checkForAndHandleModeChange(message)) { return HANDLED; } + Log.d(TAG, "Unhandled message in WifiDisabledState: " + message); return NOT_HANDLED; } @@ -432,10 +432,6 @@ public class ActiveModeWarden { @Override public boolean processMessage(Message message) { - if (checkForAndHandleModeChange(message)) { - return HANDLED; - } - switch(message.what) { case CMD_START_CLIENT_MODE: Log.d(TAG, "Received CMD_START_CLIENT_MODE when active - drop"); @@ -462,7 +458,7 @@ public class ActiveModeWarden { mModeStateMachine.transitionTo(mWifiDisabledState); break; default: - return NOT_HANDLED; + return checkForAndHandleModeChange(message); } return NOT_HANDLED; } @@ -517,10 +513,6 @@ public class ActiveModeWarden { @Override public boolean processMessage(Message message) { - if (checkForAndHandleModeChange(message)) { - return HANDLED; - } - switch(message.what) { case CMD_START_SCAN_ONLY_MODE: Log.d(TAG, "Received CMD_START_SCAN_ONLY_MODE when active - drop"); @@ -548,7 +540,7 @@ public class ActiveModeWarden { mModeStateMachine.transitionTo(mWifiDisabledState); break; default: - return NOT_HANDLED; + return checkForAndHandleModeChange(message); } return HANDLED; } diff --git a/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java b/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java index f52229c1d..df7b148c7 100644 --- a/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ActiveModeWardenTest.java @@ -311,8 +311,8 @@ public class ActiveModeWardenTest { } /** - * Thest that we can switch from ScanOnlyActiveMode to another mode. - * Expectation: When switching out of ScanOlyModeActivState we stop the ScanOnlyModeManager. + * Test that we can switch from ScanOnlyActiveMode to another mode. + * Expectation: When switching out of ScanOnlyModeActivState we stop the ScanOnlyModeManager. */ @Test public void testSwitchModeWhenScanOnlyModeActiveState() throws Exception { @@ -326,6 +326,18 @@ public class ActiveModeWardenTest { } /** + * Reentering ClientModeActiveState should be a NOP. + */ + @Test + public void testReenterClientModeActiveStateIsNop() throws Exception { + enterClientModeActiveState(); + reset(mClientModeManager); + mActiveModeWarden.enterClientMode(); + mLooper.dispatchAll(); + verify(mClientModeManager, never()).start(); + } + + /** * Test that we can switch from SoftApActiveMode to another mode. * Expectation: When switching out of SoftApModeActiveState we do not impact softap operation */ |