commit a25b1a272cd55af9d3a0d87d86f2095cf14c878a
author Irfan Sheriff <isheriff@google.com> Thu Nov 03 23:10:04 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 03 23:10:04 2011 +0000
tree 12199731a4dcaa2cca2bbdd71c1d2b7e10f990f9
parent b50d9bb630e3f0d71bfb9fe0d3bd98af95368cbc
parent a3d9eba10461158a52acfc2a0324696b25db761f

am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1

* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
  Reset IP failure counter on a success

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

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index e981da7..a46771b 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -1651,6 +1651,7 @@
             mDhcpInfoInternal = dhcpInfoInternal;
         }
         mLastSignalLevel = -1; // force update of signal strength
+        mReconnectCount = 0; //Reset IP failure tracking
         WifiConfigStore.setIpConfiguration(mLastNetworkId, dhcpInfoInternal);
         InetAddress addr = NetworkUtils.numericToInetAddress(dhcpInfoInternal.ipAddress);
         mWifiInfo.setInetAddress(addr);