Merge "Fix wrong voice call time in battery page" into oc-dev am: 057bd05420

am: 5e42c8e012

Change-Id: I6dd0bf0fe2b4229e05bdc8cb3031c24ce39f3355
This commit is contained in:
jackqdyulei
2017-04-21 20:29:17 +00:00
committed by android-build-merger
2 changed files with 25 additions and 4 deletions

View File

@@ -101,11 +101,12 @@ public class AdvancedPowerUsageDetail extends PowerUsageBase implements
final BatterySipper sipper = entry.sipper;
final BatteryStats.Uid uid = sipper.uidObj;
final BatteryUtils batteryUtils = BatteryUtils.getInstance(caller);
final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP;
final long backgroundTimeMs = batteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.BACKGROUND, uid, which);
final long foregroundTimeMs = batteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, uid, which);
final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, uid, which) : sipper.usageTimeMs;
final long backgroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.BACKGROUND, uid, which) : 0;
if (ArrayUtils.isEmpty(sipper.mPackages)) {
// populate data for system app