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

Merge "Show wifi and bluetooth item in battery settings" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-18 19:13:33 +00:00
committed by Android (Google) Code Review
parent 28cf04d994 6c9dc0b1ca
commit 21d2403c67
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,9 +185,7 @@ public class BatteryUtils {
return drainType == BatterySipper.DrainType.IDLE return drainType == BatterySipper.DrainType.IDLE
|| drainType == BatterySipper.DrainType.CELL || drainType == BatterySipper.DrainType.CELL
|| drainType == BatterySipper.DrainType.WIFI
|| drainType == BatterySipper.DrainType.SCREEN || drainType == BatterySipper.DrainType.SCREEN
|| drainType == BatterySipper.DrainType.BLUETOOTH
|| drainType == BatterySipper.DrainType.UNACCOUNTED || drainType == BatterySipper.DrainType.UNACCOUNTED
|| drainType == BatterySipper.DrainType.OVERCOUNTED || drainType == BatterySipper.DrainType.OVERCOUNTED
|| (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP

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

@@ -213,12 +213,6 @@ public class BatteryUtilsTest {
assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue(); assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
} }
@Test
public void testShouldHideSipper_TypeWifi_ReturnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.WIFI;
assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
}
@Test @Test
public void testShouldHideSipper_TypeCell_ReturnTrue() { public void testShouldHideSipper_TypeCell_ReturnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL; mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL;
@@ -231,12 +225,6 @@ public class BatteryUtilsTest {
assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue(); assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
} }
@Test
public void testShouldHideSipper_TypeBluetooth_ReturnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
}
@Test @Test
public void testShouldHideSipper_TypeSystem_ReturnTrue() { public void testShouldHideSipper_TypeSystem_ReturnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP; mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;