From 60d0d22c75ef49d151290592652b92f3e199679b Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Thu, 10 Jun 2010 14:05:23 -0700 Subject: Remove indefinite DHCP retries Replace indefinite DHCP retries with a sufficiently large retry count Bug: 2761057 Change-Id: I4570b74476aa78c71c73e06c2aafac33d924e867 --- wifi/java/android/net/wifi/WifiStateTracker.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'wifi/java/android/net') diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 978d821..3813015 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -156,7 +156,7 @@ public class WifiStateTracker extends NetworkStateTracker { * See {@link Settings.Secure#WIFI_MAX_DHCP_RETRY_COUNT}. This is the default * value if a Settings value is not present. */ - private static final int DEFAULT_MAX_DHCP_RETRIES = 2; + private static final int DEFAULT_MAX_DHCP_RETRIES = 9; private static final int DRIVER_POWER_MODE_AUTO = 0; private static final int DRIVER_POWER_MODE_ACTIVE = 1; @@ -1100,16 +1100,15 @@ public class WifiStateTracker extends NetworkStateTracker { String BSSID = (msg.obj != null) ? msg.obj.toString() : null; /** * If we've exceeded the maximum number of retries for reconnecting - * to a given network, blacklist the BSSID to allow a connection attempt on - * an alternate BSSID if available + * to a given network, disable the network */ if (mWifiInfo.getSupplicantState() != SupplicantState.UNINITIALIZED) { if (++mReconnectCount > getMaxDhcpRetries()) { if (LOCAL_LOGD) { Log.d(TAG, "Failed reconnect count: " + - mReconnectCount + " Blacklisting " + BSSID); + mReconnectCount + " Disabling " + BSSID); } - addToBlacklist(BSSID); + mWM.disableNetwork(mLastNetworkId); } reconnectCommand(); } -- cgit v1.1