summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-10-23 10:45:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-23 10:45:42 -0700
commitc48ca657f801b120e88c94287cdeecddc1a46e88 (patch)
tree2104dd55007691a208c9adb6d18fdcd9af358f97 /wifi/java
parent21ce854b50667bf675bc36ce0db1a3d6f0a2ab92 (diff)
parente6464af00033370730e530e4d5402cd049768014 (diff)
downloadframeworks_base-c48ca657f801b120e88c94287cdeecddc1a46e88.zip
frameworks_base-c48ca657f801b120e88c94287cdeecddc1a46e88.tar.gz
frameworks_base-c48ca657f801b120e88c94287cdeecddc1a46e88.tar.bz2
Merge "Fix driver stop handling" into jb-mr1-dev
Diffstat (limited to 'wifi/java')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index fd76fc8..040ff24 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2940,6 +2940,7 @@ public class WifiStateMachine extends StateMachine {
transitionTo(mTransitionToState);
break;
/* Defer wifi start/shut and driver commands */
+ case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
case CMD_LOAD_DRIVER:
case CMD_UNLOAD_DRIVER:
case CMD_START_SUPPLICANT: