summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
diff options
context:
space:
mode:
authorPrerepa Viswanadham <dham@google.com>2015-10-07 18:00:32 -0700
committerPrerepa Viswanadham <dham@google.com>2015-10-07 18:00:32 -0700
commit5e3dba910eb8c050b1e55e328d394e36c24d63a6 (patch)
tree30c78f9a5d54c6a4b06272fcd3be34787aa14d14 /service/java/com/android
parentcacdd4fc3f67da6812dc0d0ecab487e626e49cfa (diff)
downloadandroid_frameworks_opt_net_wifi-5e3dba910eb8c050b1e55e328d394e36c24d63a6.tar.gz
android_frameworks_opt_net_wifi-5e3dba910eb8c050b1e55e328d394e36c24d63a6.tar.bz2
android_frameworks_opt_net_wifi-5e3dba910eb8c050b1e55e328d394e36c24d63a6.zip
Handle supplicant state changes in non-ConnectModeState
Due to race conditions, where in supplicant state in WiFi State machine can get get stuck in ASSOCIATING state, whereas the underlying supplicant has disconnected. This event is dropped in WiFi StateMachine if it transitions out to non-ConnectModeState causing state mismatch and future inability for auto join to kick in and connect. Bug: 24580325 Change-Id: I9e833f3e3ca01f04f76ad348c92f2b29fef8f817
Diffstat (limited to 'service/java/com/android')
-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 e33c6ce34..c9817b4c8 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -6691,6 +6691,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;
}