Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 451b7edfd7 (95a0bd4c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/BatteryUtils.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -330,7 +330,8 @@ public class BatteryUtils {
		long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
		final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
		if (timer != null) {
		return timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED);
		return convertUsToMs(
		timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));
		}

		return 0;

+12 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,8 @@ public class BatteryUtilsTest {
		@Mock
		private BatteryStats.Uid mUid;
		@Mock
		private BatteryStats.Timer mTimer;
		@Mock
		private BatterySipper mNormalBatterySipper;
		@Mock
		private BatterySipper mWifiBatterySipper;
		@@ -358,6 +360,16 @@ public class BatteryUtilsTest {
		.isEqualTo(R.string.battery_abnormal_location_summary);
		}

		@Test
		public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {
		doReturn(mTimer).when(mUid).getForegroundActivityTimer();
		doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer).getTotalTimeLocked(anyLong(),
		anyInt());

		assertThat(mBatteryUtils.getForegroundActivityTotalTimeMs(mUid, 0)).isEqualTo(
		TIME_SINCE_LAST_FULL_CHARGE_MS);
		}

		private BatterySipper createTestSmearBatterySipper(long activityTime, long topTime,
		double totalPowerMah, int uidCode, boolean isUidNull) {
		final BatterySipper sipper = mock(BatterySipper.class);