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

Commit 6c9dc0b1 authored by jackqdyulei's avatar jackqdyulei
Browse files

Show wifi and bluetooth item in battery settings 

Change-Id: Icc1824758908b14ad895dcc28a63a5d9c685b490
Fix: 38328856
Fix: 38328641
Test: RunSettingsRoboTests
parent d6aa9f34

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

+0 −2
Original line number Diff line number Diff line
@@ -144,9 +144,7 @@ public class BatteryUtils { 


        return drainType == BatterySipper.DrainType.IDLE

                || drainType == BatterySipper.DrainType.CELL

                || drainType == BatterySipper.DrainType.WIFI

                || drainType == BatterySipper.DrainType.SCREEN

                || drainType == BatterySipper.DrainType.BLUETOOTH

                || drainType == BatterySipper.DrainType.UNACCOUNTED

                || drainType == BatterySipper.DrainType.OVERCOUNTED

                || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP

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

+0 −12
Original line number Diff line number Diff line
@@ -205,12 +205,6 @@ public class BatteryUtilsTest { 
        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();

    }



    @Test

    public void testShouldHideSipper_TypeWifi_ReturnTrue() {

        mNormalBatterySipper.drainType = BatterySipper.DrainType.WIFI;

        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();

    }



    @Test

    public void testShouldHideSipper_TypeCell_ReturnTrue() {

        mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL;
@@ -223,12 +217,6 @@ public class BatteryUtilsTest { 
        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();

    }



    @Test

    public void testShouldHideSipper_TypeBluetooth_ReturnTrue() {

        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;

        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();

    }



    @Test

    public void testShouldHideSipper_TypeSystem_ReturnTrue() {

        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;