summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-11-03 23:10:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-03 23:10:04 +0000
commita25b1a272cd55af9d3a0d87d86f2095cf14c878a (patch)
tree12199731a4dcaa2cca2bbdd71c1d2b7e10f990f9 /wifi/java/android
parentb50d9bb630e3f0d71bfb9fe0d3bd98af95368cbc (diff)
parenta3d9eba10461158a52acfc2a0324696b25db761f (diff)
downloadframeworks_base-a25b1a272cd55af9d3a0d87d86f2095cf14c878a.zip
frameworks_base-a25b1a272cd55af9d3a0d87d86f2095cf14c878a.tar.gz
frameworks_base-a25b1a272cd55af9d3a0d87d86f2095cf14c878a.tar.bz2
am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f': Reset IP failure counter on a success
Diffstat (limited to 'wifi/java/android')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java1
1 files changed, 1 insertions, 0 deletions
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 @@ public class WifiStateMachine extends StateMachine {
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);