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

am b3444560: am 27fba679: Fix Throttle reset.

Browse Source 
Merge commit 'b344456083a4fa3911ebf58c73f022827cc073eb' into kraken

* commit 'b344456083a4fa3911ebf58c73f022827cc073eb':
  Fix Throttle reset.
This commit is contained in:
Robert Greenwalt
2010-04-26 15:47:28 -07:00
committed by Android Git Automerger
parent 62801264e3 b344456083
commit 87ac404d6d
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/java/com/android/server/ThrottleService.java
View File

@@ -732,23 +732,25 @@ public class ThrottleService extends IThrottleManager.Stub {
checkForSubscriberId(); checkForSubscriberId();
boolean startNewPeriod = true; boolean startNewPeriod = true;
// if we rolled back in time, toss out if (start.equals(mPeriodStart) && end.equals(mPeriodEnd)) {
// if we rolled foward, advance to the next // same endpoints - keep collecting
if (end.before(mPeriodStart)) {
if (DBG) { if (DBG) {
Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," + Slog.d(TAG, "same period (" + start.getTimeInMillis() + "," +
end.getTimeInMillis() + ") - old start was " + end.getTimeInMillis() +") - ammending data");
mPeriodStart.getTimeInMillis() + ", wiping");
} }
synchronized (mParent) { startNewPeriod = false;
mPeriodRxData[mCurrentPeriod] = 0; } else {
mPeriodTxData[mCurrentPeriod] = 0;
}
} else if(start.after(mPeriodEnd)) {
if (DBG) { if (DBG) {
Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," + if(start.equals(mPeriodEnd) || start.after(mPeriodEnd)) {
end.getTimeInMillis() + ") - old end was " + Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," +
mPeriodEnd.getTimeInMillis() + ", following"); end.getTimeInMillis() + ") - old end was " +
mPeriodEnd.getTimeInMillis() + ", following");
} else {
Slog.d(TAG, "new period (" + start.getTimeInMillis() + "," +
end.getTimeInMillis() + ") replacing old (" +
mPeriodStart.getTimeInMillis() + "," +
mPeriodEnd.getTimeInMillis() + ")");
}
} }
synchronized (mParent) { synchronized (mParent) {
++mCurrentPeriod; ++mCurrentPeriod;
@@ -756,12 +758,6 @@ public class ThrottleService extends IThrottleManager.Stub {
mPeriodRxData[mCurrentPeriod] = 0; mPeriodRxData[mCurrentPeriod] = 0;
mPeriodTxData[mCurrentPeriod] = 0; mPeriodTxData[mCurrentPeriod] = 0;
} }
} else {
startNewPeriod = false;
if (DBG) {
Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," +
end.getTimeInMillis() + ") - we fit - ammending to last period");
}
} }
setPeriodStart(start); setPeriodStart(start);
setPeriodEnd(end); setPeriodEnd(end);