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

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

Browse Source 
am: 9a30ceab83

Change-Id: I3e1b14434ae00357f0193bb917469319a212b155
This commit is contained in:
jackqdyulei
2017-06-28 19:45:17 +00:00
committed by android-build-merger
parent 9d4a2806a8 9a30ceab83
commit 881b581e0a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,8 @@ public class BatteryUtils {
&& sipper.drainType != BatterySipper.DrainType.SCREEN && sipper.drainType != BatterySipper.DrainType.SCREEN
&& sipper.drainType != BatterySipper.DrainType.UNACCOUNTED && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED
&& sipper.drainType != BatterySipper.DrainType.BLUETOOTH && 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 // Don't add it if it is overcounted, unaccounted, wifi, bluetooth, or screen
proportionalSmearPowerMah += sipper.totalPowerMah; proportionalSmearPowerMah += sipper.totalPowerMah;
} }

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

@@ -80,6 +80,7 @@ public class BatteryUtilsTest {
private static final long TIME_EXPECTED_BACKGROUND = 6000; private static final long TIME_EXPECTED_BACKGROUND = 6000;
private static final long TIME_EXPECTED_ALL = 7500; private static final long TIME_EXPECTED_ALL = 7500;
private static final double BATTERY_SCREEN_USAGE = 300; 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_SYSTEM_USAGE = 600;
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;
@@ -112,6 +113,8 @@ public class BatteryUtilsTest {
private BatterySipper mSystemBatterySipper; private BatterySipper mSystemBatterySipper;
@Mock @Mock
private BatterySipper mCellBatterySipper; private BatterySipper mCellBatterySipper;
@Mock
private BatterySipper mIdleBatterySipper;
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext; private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -163,6 +166,9 @@ public class BatteryUtilsTest {
mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED; mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE; mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE;
mIdleBatterySipper.drainType = BatterySipper.DrainType.IDLE;
mIdleBatterySipper.totalPowerMah = BATTERY_IDLE_USAGE;
mBatteryUtils = BatteryUtils.getInstance(RuntimeEnvironment.application); mBatteryUtils = BatteryUtils.getInstance(RuntimeEnvironment.application);
mBatteryUtils.mPowerUsageFeatureProvider = mProvider; mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
@@ -211,6 +217,7 @@ public class BatteryUtilsTest {
sippers.add(mUnaccountedBatterySipper); sippers.add(mUnaccountedBatterySipper);
sippers.add(mWifiBatterySipper); sippers.add(mWifiBatterySipper);
sippers.add(mBluetoothBatterySipper); sippers.add(mBluetoothBatterySipper);
sippers.add(mIdleBatterySipper);
when(mProvider.isTypeSystem(mSystemBatterySipper)) when(mProvider.isTypeSystem(mSystemBatterySipper))
.thenReturn(true); .thenReturn(true);
doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any()); doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());