PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop the misc and not smear it.

Browse Source 
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
This commit is contained in:
jackqdyulei
2017-05-16 16:39:03 -07:00
parent 2b923ce44f
commit 7d7080ab64
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,8 +132,9 @@ public class BatteryUtils {
if (shouldHideSipper(sipper)) { if (shouldHideSipper(sipper)) {
sippers.remove(i); sippers.remove(i);
if (sipper.drainType != BatterySipper.DrainType.OVERCOUNTED if (sipper.drainType != BatterySipper.DrainType.OVERCOUNTED
&& sipper.drainType != BatterySipper.DrainType.SCREEN) { && sipper.drainType != BatterySipper.DrainType.SCREEN
// Don't add it if it is overcounted or screen && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED) {
// Don't add it if it is overcounted, unaccounted or screen
proportionalSmearPowerMah += sipper.totalPowerMah; proportionalSmearPowerMah += sipper.totalPowerMah;
} }
} }

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

@@ -192,8 +192,7 @@ public class BatteryUtilsTest {
final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers); final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers);
assertThat(sippers).containsExactly(mNormalBatterySipper); assertThat(sippers).containsExactly(mNormalBatterySipper);
assertThat(totalUsage).isWithin(PRECISION).of( assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SYSTEM_USAGE);
BATTERY_SYSTEM_USAGE + BATTERY_UNACCOUNTED_USAGE);
} }
@Test @Test