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

Merge "Hide wifi and bt in battery settings" into oc-dev

Browse Source 
am: 05777a7918

Change-Id: If676ec0119bebed800727f618225fd355e9da74f
This commit is contained in:
jackqdyulei
2017-06-20 22:55:47 +00:00
committed by android-build-merger
parent aad82fa4ee 05777a7918
commit 9d0d6e4fcc
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,8 +141,10 @@ public class BatteryUtils {
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
&& sipper.drainType != BatterySipper.DrainType.UNACCOUNTED) { && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED
// Don't add it if it is overcounted, unaccounted or screen && sipper.drainType != BatterySipper.DrainType.BLUETOOTH
&& sipper.drainType != BatterySipper.DrainType.WIFI) {
// Don't add it if it is overcounted, unaccounted, wifi, bluetooth, or screen
proportionalSmearPowerMah += sipper.totalPowerMah; proportionalSmearPowerMah += sipper.totalPowerMah;
} }
} }
@@ -196,6 +198,8 @@ public class BatteryUtils {
|| drainType == BatterySipper.DrainType.SCREEN || drainType == BatterySipper.DrainType.SCREEN
|| drainType == BatterySipper.DrainType.UNACCOUNTED || drainType == BatterySipper.DrainType.UNACCOUNTED
|| drainType == BatterySipper.DrainType.OVERCOUNTED || drainType == BatterySipper.DrainType.OVERCOUNTED
|| drainType == BatterySipper.DrainType.BLUETOOTH
|| drainType == BatterySipper.DrainType.WIFI
|| (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP
|| mPowerUsageFeatureProvider.isTypeService(sipper) || mPowerUsageFeatureProvider.isTypeService(sipper)
|| mPowerUsageFeatureProvider.isTypeSystem(sipper); || mPowerUsageFeatureProvider.isTypeSystem(sipper);

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

@@ -84,6 +84,8 @@ public class BatteryUtilsTest {
private static final double BATTERY_OVERACCOUNTED_USAGE = 500; private static final double BATTERY_OVERACCOUNTED_USAGE = 500;
private static final double BATTERY_UNACCOUNTED_USAGE = 700; private static final double BATTERY_UNACCOUNTED_USAGE = 700;
private static final double BATTERY_APP_USAGE = 100; private static final double BATTERY_APP_USAGE = 100;
private static final double BATTERY_WIFI_USAGE = 200;
private static final double BATTERY_BLUETOOTH_USAGE = 300;
private static final double TOTAL_BATTERY_USAGE = 1000; private static final double TOTAL_BATTERY_USAGE = 1000;
private static final double HIDDEN_USAGE = 200; private static final double HIDDEN_USAGE = 200;
private static final int DISCHARGE_AMOUNT = 80; private static final int DISCHARGE_AMOUNT = 80;
@@ -95,6 +97,10 @@ public class BatteryUtilsTest {
@Mock @Mock
private BatterySipper mNormalBatterySipper; private BatterySipper mNormalBatterySipper;
@Mock @Mock
private BatterySipper mWifiBatterySipper;
@Mock
private BatterySipper mBluetoothBatterySipper;
@Mock
private BatterySipper mScreenBatterySipper; private BatterySipper mScreenBatterySipper;
@Mock @Mock
private BatterySipper mOvercountedBatterySipper; private BatterySipper mOvercountedBatterySipper;
@@ -136,6 +142,12 @@ public class BatteryUtilsTest {
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP; mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE; mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
mWifiBatterySipper.drainType = BatterySipper.DrainType.WIFI;
mWifiBatterySipper.totalPowerMah = BATTERY_WIFI_USAGE;
mBluetoothBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
mBluetoothBatterySipper.totalPowerMah = BATTERY_BLUETOOTH_USAGE;
mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN; mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE; mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE;
@@ -195,6 +207,8 @@ public class BatteryUtilsTest {
sippers.add(mSystemBatterySipper); sippers.add(mSystemBatterySipper);
sippers.add(mOvercountedBatterySipper); sippers.add(mOvercountedBatterySipper);
sippers.add(mUnaccountedBatterySipper); sippers.add(mUnaccountedBatterySipper);
sippers.add(mWifiBatterySipper);
sippers.add(mBluetoothBatterySipper);
when(mProvider.isTypeSystem(mSystemBatterySipper)) when(mProvider.isTypeSystem(mSystemBatterySipper))
.thenReturn(true); .thenReturn(true);
doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any()); doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());
@@ -235,6 +249,18 @@ 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
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;