diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 07:21:07 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 07:21:07 -0700 |
| commit | 07bde72ff9209de9c037d9bba36bdf0cba299aab (patch) | |
| tree | 0013a04e97baa40e711180b60d58ba553cb886c4 /wifi/java/android/net | |
| parent | 4d3a7b075298d1379e9d6ba84bc02a347344a001 (diff) | |
| parent | 9455f8f2667bd86a7e51b19112f759406274e76b (diff) | |
| download | frameworks_base-07bde72ff9209de9c037d9bba36bdf0cba299aab.zip frameworks_base-07bde72ff9209de9c037d9bba36bdf0cba299aab.tar.gz frameworks_base-07bde72ff9209de9c037d9bba36bdf0cba299aab.tar.bz2 | |
resolved conflicts for merge of 9455f8f2 to jb-mr1-dev
Change-Id: I6c6970adb58ac45473c7cc665d99f8e8a6ca8571
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 1d06c76..a5322fa 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3553,7 +3553,12 @@ public class WifiStateMachine extends StateMachine { handleNetworkDisconnect(); break; case WifiMonitor.AUTHENTICATION_FAILURE_EVENT: - // EAP failures do not mean much during WPS + // 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 |