diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-06-10 18:56:04 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-10 18:56:04 -0700 |
commit | 9f2a0115220c8e288c32d8cf90e235a2f2be115b (patch) | |
tree | 736d5fe2ce161df6f731101ba5a2c47435f82b65 | |
parent | f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4 (diff) | |
parent | 60d0d22c75ef49d151290592652b92f3e199679b (diff) | |
download | base-9f2a0115220c8e288c32d8cf90e235a2f2be115b.tar.gz |
Merge "Remove indefinite DHCP retries" into froyo
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 978d821ec0db..38130152d210 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(); } |