diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-23 09:31:02 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-23 09:31:03 -0700 |
| commit | 8f7100a03768d2863255024cf0c604cac10c9d5d (patch) | |
| tree | 56828c3f9f838fe48a6aab8605de0031a92aa370 /wifi/java | |
| parent | a4e34ae82f2ccf037875462809be6e5139807b44 (diff) | |
| parent | 5770b2dcf6f28f1ea44146d5eb8c8a6b9cfc3fce (diff) | |
| download | frameworks_base-8f7100a03768d2863255024cf0c604cac10c9d5d.zip frameworks_base-8f7100a03768d2863255024cf0c604cac10c9d5d.tar.gz frameworks_base-8f7100a03768d2863255024cf0c604cac10c9d5d.tar.bz2 | |
Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index bb09704..78c4b6c 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3535,6 +3535,13 @@ public class WifiStateMachine extends StateMachine { if (DBG) log("Network connection lost"); handleNetworkDisconnect(); break; + case WifiMonitor.AUTHENTICATION_FAILURE_EVENT: + // Disregard auth failure events during WPS connection. The + // EAP sequence is retried several times, and there might be + // failures (especially for wps pin). We will get a WPS_XXX + // event at the end of the sequence anyway. + if (DBG) log("Ignore auth failure during WPS connection"); + break; case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT: //Throw away supplicant state changes when WPS is running. //We will start getting supplicant state changes once we get |