Merge "Fix error in MeasuredEnergySnapshot voltage" into sc-dev (ed21f7f9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/MeasuredEnergySnapshot.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ public class MeasuredEnergySnapshot {
		/**
		* For a consumer of type {@link EnergyConsumerType#OTHER}, updates
		* {@link #mAttributionSnapshots} with freshly measured energies (per uid) and returns the
		* charge consumed (in microcouloumbs) between the previously stored values and the passed-in
		* charge consumed (in microcoulombs) between the previously stored values and the passed-in
		* values.
		*
		* @param consumerInfo a consumer of type {@link EnergyConsumerType#OTHER}.
		@@ -341,11 +341,11 @@ public class MeasuredEnergySnapshot {
		return numOrdinals;
		}

		/** Calculate charge consumption (in microcouloumbs) from a given energy and voltage */
		/** Calculate charge consumption (in microcoulombs) from a given energy and voltage */
		private long calculateChargeConsumedUC(long deltaEnergyUJ, int avgVoltageMV) {
		// To overflow, a 3.7V 10000mAh battery would need to completely drain 69244 times
		// since the last snapshot. Round up to the nearest whole long.
		return (deltaEnergyUJ * MILLIVOLTS_PER_VOLT + (avgVoltageMV + 1) / 2) / avgVoltageMV;
		// since the last snapshot. Round off to the nearest whole long.
		return (deltaEnergyUJ * MILLIVOLTS_PER_VOLT + (avgVoltageMV / 2)) / avgVoltageMV;
		}

		}