resolved conflicts for merge of 9455f8f to jb-mr1-dev

Change-Id: I6c6970adb58ac45473c7cc665d99f8e8a6ca8571

Author: Jean-Baptiste Queru

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -3553,7 +3553,12 @@ public boolean processMessage(Message message) {
                     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