Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Irfan Sheriff
2010-06-10 19:02:23 -07:00
committed by Android Git Automerger
parent 5b669581b3 f4f614f5ed
commit 749defb0ca
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -156,7 +156,7 @@ public class WifiStateTracker extends NetworkStateTracker {
* See {@link Settings.Secure#WIFI_MAX_DHCP_RETRY_COUNT}. This is the default * See {@link Settings.Secure#WIFI_MAX_DHCP_RETRY_COUNT}. This is the default
* value if a Settings value is not present. * 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_AUTO = 0;
private static final int DRIVER_POWER_MODE_ACTIVE = 1; 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; String BSSID = (msg.obj != null) ? msg.obj.toString() : null;
/** /**
* If we've exceeded the maximum number of retries for reconnecting * If we've exceeded the maximum number of retries for reconnecting
* to a given network, blacklist the BSSID to allow a connection attempt on * to a given network, disable the network
* an alternate BSSID if available
*/ */
if (mWifiInfo.getSupplicantState() != SupplicantState.UNINITIALIZED) { if (mWifiInfo.getSupplicantState() != SupplicantState.UNINITIALIZED) {
if (++mReconnectCount > getMaxDhcpRetries()) { if (++mReconnectCount > getMaxDhcpRetries()) {
if (LOCAL_LOGD) { if (LOCAL_LOGD) {
Log.d(TAG, "Failed reconnect count: " + Log.d(TAG, "Failed reconnect count: " +
mReconnectCount + " Blacklisting " + BSSID); mReconnectCount + " Disabling " + BSSID);
} }
addToBlacklist(BSSID); mWM.disableNetwork(mLastNetworkId);
} }
reconnectCommand(); reconnectCommand();
} }