Merge "MeasuredEnergyStats - remove unused accumulate parameter" into sc-dev (84fc40ad) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+8 −10

core/java/com/android/internal/power/MeasuredEnergyStats.java

+11 −15

core/tests/coretests/src/com/android/internal/power/MeasuredEnergyStatsTest.java

+55 −55

Original line number	Original line	Diff line number	Diff line
	@@ -7965,16 +7965,14 @@ public class BatteryStatsImpl extends BatteryStats {

	/** Adds the given energy to the given standard energy bucket for this uid. */		/** Adds the given energy to the given standard energy bucket for this uid. */
	private void addEnergyToStandardBucketLocked(long energyDeltaUJ,		private void addEnergyToStandardBucketLocked(long energyDeltaUJ,
	@StandardEnergyBucket int energyBucket, boolean accumulate) {		@StandardEnergyBucket int energyBucket) {
	getOrCreateMeasuredEnergyStatsLocked()		getOrCreateMeasuredEnergyStatsLocked()
	.updateStandardBucket(energyBucket, energyDeltaUJ, accumulate);		.updateStandardBucket(energyBucket, energyDeltaUJ);
	}		}

	/** Adds the given energy to the given custom energy bucket for this uid. */		/** Adds the given energy to the given custom energy bucket for this uid. */
	private void addEnergyToCustomBucketLocked(long energyDeltaUJ, int energyBucket,		private void addEnergyToCustomBucketLocked(long energyDeltaUJ, int energyBucket) {
	boolean accumulate) {		getOrCreateMeasuredEnergyStatsLocked().updateCustomBucket(energyBucket, energyDeltaUJ);
	getOrCreateMeasuredEnergyStatsLocked()
	.updateCustomBucket(energyBucket, energyDeltaUJ, accumulate);
	}		}

	/**		/**
	@@ -12468,7 +12466,7 @@ public class BatteryStatsImpl extends BatteryStats {
	return;		return;
	}		}

	mGlobalMeasuredEnergyStats.updateStandardBucket(energyBucket, energyUJ, true);		mGlobalMeasuredEnergyStats.updateStandardBucket(energyBucket, energyUJ);

	// Now we blame individual apps, but only if the display was ON.		// Now we blame individual apps, but only if the display was ON.
	if (energyBucket != MeasuredEnergyStats.ENERGY_BUCKET_SCREEN_ON) {		if (energyBucket != MeasuredEnergyStats.ENERGY_BUCKET_SCREEN_ON) {
	@@ -12506,7 +12504,7 @@ public class BatteryStatsImpl extends BatteryStats {
	final long appDisplayEnergyMJ =		final long appDisplayEnergyMJ =
	(totalDisplayEnergyMJ * fgTimeMs + (totalFgTimeMs / 2))		(totalDisplayEnergyMJ * fgTimeMs + (totalFgTimeMs / 2))
	/ totalFgTimeMs;		/ totalFgTimeMs;
	uid.addEnergyToStandardBucketLocked(appDisplayEnergyMJ * 1000, energyBucket, true);		uid.addEnergyToStandardBucketLocked(appDisplayEnergyMJ * 1000, energyBucket);

	// To mitigate round-off errors, remove this app from numerator & denominator totals		// To mitigate round-off errors, remove this app from numerator & denominator totals
	totalDisplayEnergyMJ -= appDisplayEnergyMJ;		totalDisplayEnergyMJ -= appDisplayEnergyMJ;
	@@ -12533,7 +12531,7 @@ public class BatteryStatsImpl extends BatteryStats {
	if (mGlobalMeasuredEnergyStats == null) return;		if (mGlobalMeasuredEnergyStats == null) return;
	if (!mOnBatteryInternal \|\| mIgnoreNextExternalStats \|\| totalEnergyUJ <= 0) return;		if (!mOnBatteryInternal \|\| mIgnoreNextExternalStats \|\| totalEnergyUJ <= 0) return;

	mGlobalMeasuredEnergyStats.updateCustomBucket(customEnergyBucket, totalEnergyUJ, true);		mGlobalMeasuredEnergyStats.updateCustomBucket(customEnergyBucket, totalEnergyUJ);

	if (uidEnergies == null) return;		if (uidEnergies == null) return;

Original line number	Original line	Diff line number	Diff line
	@@ -193,27 +193,24 @@ public class MeasuredEnergyStats {
	return mAccumulatedEnergiesMicroJoules.length;		return mAccumulatedEnergiesMicroJoules.length;
	}		}

	// TODO: Get rid of the 'accumulate' boolean. It's always true.
	/** Updates the given standard energy bucket with the given energy if accumulate is true. */		/** Updates the given standard energy bucket with the given energy if accumulate is true. */
	public void updateStandardBucket(@StandardEnergyBucket int bucket, long energyDeltaUJ,		public void updateStandardBucket(@StandardEnergyBucket int bucket, long energyDeltaUJ) {
	boolean accumulate) {
	checkValidStandardBucket(bucket);		checkValidStandardBucket(bucket);
	updateEntry(bucket, energyDeltaUJ, accumulate);		updateEntry(bucket, energyDeltaUJ);
	}		}

	/** Updates the given custom energy bucket with the given energy if accumulate is true. */		/** Updates the given custom energy bucket with the given energy if accumulate is true. */
	public void updateCustomBucket(int customBucket, long energyDeltaUJ, boolean accumulate) {		public void updateCustomBucket(int customBucket, long energyDeltaUJ) {
	if (!isValidCustomBucket(customBucket)) {		if (!isValidCustomBucket(customBucket)) {
	Slog.e(TAG, "Attempted to update invalid custom bucket " + customBucket);		Slog.e(TAG, "Attempted to update invalid custom bucket " + customBucket);
	return;		return;
	}		}
	final int index = customBucketToIndex(customBucket);		final int index = customBucketToIndex(customBucket);
	updateEntry(index, energyDeltaUJ, accumulate);		updateEntry(index, energyDeltaUJ);
	}		}

	/** Updates the given index with the given energy if accumulate is true. */		/** Updates the given index with the given energy if accumulate is true. */
	private void updateEntry(int index, long energyDeltaUJ, boolean accumulate) {		private void updateEntry(int index, long energyDeltaUJ) {
	if (accumulate) {
	if (mAccumulatedEnergiesMicroJoules[index] >= 0L) {		if (mAccumulatedEnergiesMicroJoules[index] >= 0L) {
	mAccumulatedEnergiesMicroJoules[index] += energyDeltaUJ;		mAccumulatedEnergiesMicroJoules[index] += energyDeltaUJ;
	} else {		} else {
	@@ -222,7 +219,6 @@ public class MeasuredEnergyStats {
	+ mAccumulatedEnergiesMicroJoules[index]);		+ mAccumulatedEnergiesMicroJoules[index]);
	}		}
	}		}
	}

	/**		/**
	* Return accumulated energy (in microjoules) for a standard energy bucket since last reset.		* Return accumulated energy (in microjoules) for a standard energy bucket since last reset.

Original line number	Original line	Diff line number	Diff line
	@@ -81,11 +81,11 @@ public class MeasuredEnergyStatsTest {

	final MeasuredEnergyStats stats		final MeasuredEnergyStats stats
	= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);		= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40);
	stats.updateCustomBucket(0, 50, true);		stats.updateCustomBucket(0, 50);
	stats.updateCustomBucket(1, 60, true);		stats.updateCustomBucket(1, 60);

	final MeasuredEnergyStats newStats = MeasuredEnergyStats.createFromTemplate(stats);		final MeasuredEnergyStats newStats = MeasuredEnergyStats.createFromTemplate(stats);

	@@ -114,11 +114,11 @@ public class MeasuredEnergyStatsTest {

	final MeasuredEnergyStats stats		final MeasuredEnergyStats stats
	= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);		= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40);
	stats.updateCustomBucket(0, 50, true);		stats.updateCustomBucket(0, 50);
	stats.updateCustomBucket(1, 60, true);		stats.updateCustomBucket(1, 60);

	final Parcel parcel = Parcel.obtain();		final Parcel parcel = Parcel.obtain();
	stats.writeToParcel(parcel);		stats.writeToParcel(parcel);
	@@ -149,11 +149,11 @@ public class MeasuredEnergyStatsTest {

	final MeasuredEnergyStats stats		final MeasuredEnergyStats stats
	= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);		= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 10);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_ON, 5);
	stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40, true);		stats.updateStandardBucket(ENERGY_BUCKET_SCREEN_OTHER, 40);
	stats.updateCustomBucket(0, 50, true);		stats.updateCustomBucket(0, 50);
	stats.updateCustomBucket(1, 60, true);		stats.updateCustomBucket(1, 60);

	final Parcel parcel = Parcel.obtain();		final Parcel parcel = Parcel.obtain();
	MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);		MeasuredEnergyStats.writeSummaryToParcel(stats, parcel, false);
	@@ -185,17 +185,17 @@ public class MeasuredEnergyStatsTest {

	final MeasuredEnergyStats template		final MeasuredEnergyStats template
	= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);		= new MeasuredEnergyStats(supportedStandardBuckets, numCustomBuckets);