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: 451b7edfd7

Change-Id: I609e926c481e991d4039e42d0872ebcfd218679b
This commit is contained in:
Lei Yu
2017-06-28 17:54:20 +00:00
committed by android-build-merger
parent 1d16eb3622 451b7edfd7
commit d3f035af0a
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -95,6 +95,8 @@ public class BatteryUtilsTest {
@Mock @Mock
private BatteryStats.Uid mUid; private BatteryStats.Uid mUid;
@Mock @Mock
private BatteryStats.Timer mTimer;
@Mock
private BatterySipper mNormalBatterySipper; private BatterySipper mNormalBatterySipper;
@Mock @Mock
private BatterySipper mWifiBatterySipper; private BatterySipper mWifiBatterySipper;
@@ -358,6 +360,16 @@ public class BatteryUtilsTest {
.isEqualTo(R.string.battery_abnormal_location_summary); .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, private BatterySipper createTestSmearBatterySipper(long activityTime, long topTime,
double totalPowerMah, int uidCode, boolean isUidNull) { double totalPowerMah, int uidCode, boolean isUidNull) {
final BatterySipper sipper = mock(BatterySipper.class); final BatterySipper sipper = mock(BatterySipper.class);