PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev

Browse Source 
am: 33c9b7a111

Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
This commit is contained in:
jackqdyulei
2017-06-29 00:48:47 +00:00
committed by android-build-merger
parent 9ff2435ebc 33c9b7a111
commit 9d57855c96
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -331,8 +331,8 @@ public class BatteryUtils {
long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
if (timer != null) {
return convertUsToMs(
timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED));
return convertUsToMs(timer.getTotalTimeLocked(convertMsToUs(rawRealtimeMs),
BatteryStats.STATS_SINCE_CHARGED));
}
return 0;

8
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
import android.content.Context;
import android.os.BatteryStats;
import android.os.Process;
import android.os.SystemClock;
import android.text.format.DateUtils;
import com.android.internal.os.BatterySipper;
@@ -369,11 +370,12 @@ public class BatteryUtilsTest {
@Test
public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {
final long rawRealtimeMs = SystemClock.elapsedRealtime();
doReturn(mTimer).when(mUid).getForegroundActivityTimer();
doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer).getTotalTimeLocked(anyLong(),
anyInt());
doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer)
.getTotalTimeLocked(rawRealtimeMs * 1000, BatteryStats.STATS_SINCE_CHARGED);
assertThat(mBatteryUtils.getForegroundActivityTotalTimeMs(mUid, 0)).isEqualTo(
assertThat(mBatteryUtils.getForegroundActivityTotalTimeMs(mUid, rawRealtimeMs)).isEqualTo(
TIME_SINCE_LAST_FULL_CHARGE_MS);
}