Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d7080ab authored by jackqdyulei's avatar jackqdyulei
Browse files

Drop the misc and not smear it. 

Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
parent 2b923ce4

src/com/android/settings/fuelgauge/BatteryUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -132,8 +132,9 @@ public class BatteryUtils { 
            if (shouldHideSipper(sipper)) {

                sippers.remove(i);

                if (sipper.drainType != BatterySipper.DrainType.OVERCOUNTED

                        && sipper.drainType != BatterySipper.DrainType.SCREEN) {

                    // Don't add it if it is overcounted or screen

                        && sipper.drainType != BatterySipper.DrainType.SCREEN

                        && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED) {

                    // Don't add it if it is overcounted, unaccounted or screen

                    proportionalSmearPowerMah += sipper.totalPowerMah;

                }

            }

tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java

+1 −2
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ public class BatteryUtilsTest { 
        final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers);



        assertThat(sippers).containsExactly(mNormalBatterySipper);

        assertThat(totalUsage).isWithin(PRECISION).of(

                BATTERY_SYSTEM_USAGE + BATTERY_UNACCOUNTED_USAGE);

        assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SYSTEM_USAGE);

    }



    @Test