am 27fba679: Fix Throttle reset. (b3444560) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ThrottleService.java

+16 −20

Original line number	Original line	Diff line number	Diff line
	@@ -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) {
			if(start.equals(mPeriodEnd) \|\| start.after(mPeriodEnd)) {
	Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," +		Slog.d(TAG, "next period (" + start.getTimeInMillis() + "," +
	end.getTimeInMillis() + ") - old end was " +		end.getTimeInMillis() + ") - old end was " +
	mPeriodEnd.getTimeInMillis() + ", following");		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);