drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve network avoidance

Browse Source 
Adds a back-off based technique where the amount of time we wait before
avoiding wi-fi is increased.

This will reduce power consumption on devices that are experiencing high
variance on wi-fi

Change-Id: I40da03edfb5373ddb51056818ca0744dc26a5600
This commit is contained in:
Irfan Sheriff
2012-03-12 15:55:20 -07:00
parent d4933842b1
commit 90d57dfac3
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
View File

@ -113,11 +113,14 @@ public class WifiWatchdogStateMachine extends StateMachine {
private static final int RSSI_MONITOR_COUNT = 5;
private int mRssiMonitorCount = 0;
/* Avoid flapping */
private static final int MIN_INTERVAL_AVOID_BSSID_MS = 60 * 1000;
private String mLastAvoidedBssid;
/* a -ve interval to allow avoidance at boot */
private long mLastBssidAvoidedTime = -MIN_INTERVAL_AVOID_BSSID_MS;
/* Avoid flapping. The interval is changed over time as long as we continue to avoid
* under the max interval after which we reset the interval again */
private static final int MIN_INTERVAL_AVOID_BSSID_MS[] = {0, 30 * 1000, 60 * 1000,
5 * 60 * 1000, 30 * 60 * 1000};
/* Index into the interval array MIN_INTERVAL_AVOID_BSSID_MS */
private int mMinIntervalArrayIndex = 0;
private long mLastBssidAvoidedTime;
private int mCurrentSignalLevel;
@ -744,11 +747,13 @@ public class WifiWatchdogStateMachine extends StateMachine {
mCurrentSignalLevel = calculateSignalLevel(msg.arg1);
//Ready to avoid bssid again ?
long time = android.os.SystemClock.elapsedRealtime();
if (time - mLastBssidAvoidedTime > MIN_INTERVAL_AVOID_BSSID_MS) {
if (time - mLastBssidAvoidedTime > MIN_INTERVAL_AVOID_BSSID_MS[
mMinIntervalArrayIndex]) {
handleRssiChange();
} else {
if (DBG) log("Early to avoid " + mWifiInfo + " time: " + time +
" last avoided: " + mLastBssidAvoidedTime);
" last avoided: " + mLastBssidAvoidedTime +
" mMinIntervalArrayIndex: " + mMinIntervalArrayIndex);
}
break;
default:
@ -892,7 +897,20 @@ public class WifiWatchdogStateMachine extends StateMachine {
private void sendPoorLinkDetected() {
if (DBG) log("send POOR_LINK_DETECTED " + mWifiInfo);
mWsmChannel.sendMessage(POOR_LINK_DETECTED);
mLastAvoidedBssid = mWifiInfo.getBSSID();
long time = android.os.SystemClock.elapsedRealtime();
if (time - mLastBssidAvoidedTime > MIN_INTERVAL_AVOID_BSSID_MS[
MIN_INTERVAL_AVOID_BSSID_MS.length - 1]) {
mMinIntervalArrayIndex = 1;
if (DBG) log("set mMinIntervalArrayIndex to 1");
} else {
if (mMinIntervalArrayIndex < MIN_INTERVAL_AVOID_BSSID_MS.length - 1) {
mMinIntervalArrayIndex++;
}
if (DBG) log("mMinIntervalArrayIndex: " + mMinIntervalArrayIndex);
}
mLastBssidAvoidedTime = android.os.SystemClock.elapsedRealtime();
}