summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPankaj Kanwar <pkanwar@google.com>2015-10-12 00:27:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-12 00:27:34 +0000
commitf76c13a415da5e64aca41083b2c1642844311b3b (patch)
treeb2bfdec24c9f99e435ed3b99714ab1f119197e3a
parent082dd48cb77c4ba0fccaa13906b32f3219184b37 (diff)
parenta7d7d91ebbeb326d9d41e05768aa5f5667e68106 (diff)
downloadandroid_frameworks_opt_net_wifi-f76c13a415da5e64aca41083b2c1642844311b3b.tar.gz
android_frameworks_opt_net_wifi-f76c13a415da5e64aca41083b2c1642844311b3b.tar.bz2
android_frameworks_opt_net_wifi-f76c13a415da5e64aca41083b2c1642844311b3b.zip
am a7d7d91e: Merge "Handle supplicant state changes in non-ConnectModeState" into mnc-dr-dev
* commit 'a7d7d91ebbeb326d9d41e05768aa5f5667e68106': Handle supplicant state changes in non-ConnectModeState
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 27c929bfb..89c394dea 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -6661,6 +6661,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
case CMD_START_SCAN:
handleScanRequest(WifiNative.SCAN_WITHOUT_CONNECTION_SETUP, message);
break;
+ case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
+ SupplicantState state = handleSupplicantStateChange(message);
+ if(DBG) log("SupplicantState= " + state);
+ break;
default:
return NOT_HANDLED;
}