Merge "Don't show Screen as Apps in advanced battery page" into oc-dev

am: 89bc5b2bff

Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629
This commit is contained in:
Lei Yu
2017-04-18 01:08:19 +00:00
committed by android-build-merger
2 changed files with 22 additions and 1 deletions

View File

@@ -226,6 +226,11 @@ public class PowerUsageAdvanced extends PowerUsageBase {
return false;
}
@VisibleForTesting
boolean shouldShowBatterySipper(BatterySipper batterySipper) {
return batterySipper.drainType != DrainType.SCREEN;
}
@VisibleForTesting
List<PowerUsageData> parsePowerUsageData(BatteryStatsHelper statusHelper) {
final List<BatterySipper> batterySippers = statusHelper.getUsageList();
@@ -245,7 +250,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, STATUS_TYPE);
}
usageData.totalUsageTimeMs += sipper.usageTimeMs;
usageData.usageList.add(sipper);
if (shouldShowBatterySipper(sipper)) {
usageData.usageList.add(sipper);
}
}
final List<PowerUsageData> batteryDataList = new ArrayList<>(batteryDataMap.values());