diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index b5f94fc8219..17c0cd7fb0a 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -144,7 +144,8 @@ public class BatteryUtils { && sipper.drainType != BatterySipper.DrainType.SCREEN && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED && sipper.drainType != BatterySipper.DrainType.BLUETOOTH - && sipper.drainType != BatterySipper.DrainType.WIFI) { + && sipper.drainType != BatterySipper.DrainType.WIFI + && sipper.drainType != BatterySipper.DrainType.IDLE) { // Don't add it if it is overcounted, unaccounted, wifi, bluetooth, or screen proportionalSmearPowerMah += sipper.totalPowerMah; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index 29c74da8b67..ff6e52ac0ab 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -80,6 +80,7 @@ public class BatteryUtilsTest { private static final long TIME_EXPECTED_BACKGROUND = 6000; private static final long TIME_EXPECTED_ALL = 7500; private static final double BATTERY_SCREEN_USAGE = 300; + private static final double BATTERY_IDLE_USAGE = 600; private static final double BATTERY_SYSTEM_USAGE = 600; private static final double BATTERY_OVERACCOUNTED_USAGE = 500; private static final double BATTERY_UNACCOUNTED_USAGE = 700; @@ -112,6 +113,8 @@ public class BatteryUtilsTest { private BatterySipper mSystemBatterySipper; @Mock private BatterySipper mCellBatterySipper; + @Mock + private BatterySipper mIdleBatterySipper; @Mock(answer = Answers.RETURNS_DEEP_STUBS) private Context mContext; @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -163,6 +166,9 @@ public class BatteryUtilsTest { mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED; mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE; + mIdleBatterySipper.drainType = BatterySipper.DrainType.IDLE; + mIdleBatterySipper.totalPowerMah = BATTERY_IDLE_USAGE; + mBatteryUtils = BatteryUtils.getInstance(RuntimeEnvironment.application); mBatteryUtils.mPowerUsageFeatureProvider = mProvider; @@ -211,6 +217,7 @@ public class BatteryUtilsTest { sippers.add(mUnaccountedBatterySipper); sippers.add(mWifiBatterySipper); sippers.add(mBluetoothBatterySipper); + sippers.add(mIdleBatterySipper); when(mProvider.isTypeSystem(mSystemBatterySipper)) .thenReturn(true); doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());