From 613dbfbefbe570c2fd5e1e6d959411bf75f6265b Mon Sep 17 00:00:00 2001 From: Rebecca Silberstein Date: Tue, 25 Oct 2016 10:21:14 -0700 Subject: WifiStateMachine: add DisabledState Add a disabled state to maintain messages in the WifiStateMachinePrime state machine. Bug: 32402687 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I636e70968ff2f97f457769d594ce3ce724d845a5 --- .../com/android/server/wifi/WifiStateMachinePrime.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiStateMachinePrime.java b/service/java/com/android/server/wifi/WifiStateMachinePrime.java index 020861b5b..33cccbb88 100644 --- a/service/java/com/android/server/wifi/WifiStateMachinePrime.java +++ b/service/java/com/android/server/wifi/WifiStateMachinePrime.java @@ -41,12 +41,14 @@ public class WifiStateMachinePrime { public static final int CMD_START_CLIENT_MODE = 0; public static final int CMD_START_SCAN_ONLY_MODE = 1; public static final int CMD_START_SOFT_AP_MODE = 2; + public static final int CMD_DISABLE_WIFI = 3; // Create the base modes for WSM. private final State mClientModeState = new ClientModeState(); private final State mScanOnlyModeState = new ScanOnlyModeState(); private final State mSoftAPModeState = new SoftAPModeState(); + private final State mWifiDisabledState = new WifiDisabledState(); // Create the active versions of the modes for WSM. private final State mClientModeActiveState = new ClientModeActiveState(); @@ -63,6 +65,7 @@ public class WifiStateMachinePrime { addState(mScanOnlyModeActiveState, mScanOnlyModeState); addState(mSoftAPModeState); addState(mSoftAPModeActiveState, mSoftAPModeState); + addState(mWifiDisabledState); // CHECKSTYLE:ON IndentationCheck } @@ -115,6 +118,19 @@ public class WifiStateMachinePrime { } } + class WifiDisabledState extends State { + @Override + public void enter() { + // make sure everything is torn down + } + + @Override + public boolean processMessage(Message message) { + return NOT_HANDLED; + } + + } + class ModeActiveState extends State { ActiveModeManager mActiveModeManager; -- cgit v1.2.3