diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-23 09:45:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-23 09:45:30 -0700 |
| commit | 9455f8f2667bd86a7e51b19112f759406274e76b (patch) | |
| tree | 67d924752ee2b6a73f897e7df11378a396764d28 /wifi | |
| parent | 79f6c5f5673c76c359f9f4b38539cfdb0251efee (diff) | |
| parent | 729f810d3bca086cf651aa4e2299594a57d6d543 (diff) | |
| download | frameworks_base-9455f8f2667bd86a7e51b19112f759406274e76b.zip frameworks_base-9455f8f2667bd86a7e51b19112f759406274e76b.tar.gz frameworks_base-9455f8f2667bd86a7e51b19112f759406274e76b.tar.bz2 | |
am 729f810d: am 8f7100a0: Merge "WifiStateMachine: ignore auth-fail event during WPS connection"
* commit '729f810d3bca086cf651aa4e2299594a57d6d543':
WifiStateMachine: ignore auth-fail event during WPS connection
Diffstat (limited to 'wifi')
| -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 865a78b..15eb9b9 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 |