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

Commit 881b581e authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

Merge "Hide the IDLE in "app list"" into oc-dr1-dev 

am: 9a30ceab

Change-Id: I3e1b14434ae00357f0193bb917469319a212b155
parents 9d4a2806 9a30ceab

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

                }

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

+7 −0
Original line number Diff line number Diff line
@@ -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());