diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index a0ebba815e7..29cd4e8dc0f 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -226,6 +226,11 @@ public class PowerUsageAdvanced extends PowerUsageBase { return false; } + @VisibleForTesting + boolean shouldShowBatterySipper(BatterySipper batterySipper) { + return batterySipper.drainType != DrainType.SCREEN; + } + @VisibleForTesting List parsePowerUsageData(BatteryStatsHelper statusHelper) { final List 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 batteryDataList = new ArrayList<>(batteryDataMap.values()); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index 3f87bb4f69d..bbf6bef0156 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -260,4 +260,18 @@ public class PowerUsageAdvancedTest { assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse(); } + @Test + public void testShouldShowBatterySipper_typeScreen_returnFalse() { + mNormalBatterySipper.drainType = DrainType.SCREEN; + + assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isFalse(); + } + + @Test + public void testShouldShowBatterySipper_typeNormal_returnTrue() { + mNormalBatterySipper.drainType = DrainType.APP; + + assertThat(mPowerUsageAdvanced.shouldShowBatterySipper(mNormalBatterySipper)).isTrue(); + } + }