am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo

Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries

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 2c8be31..78a9674 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();
                 }