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

Hide summary for type system

Browse Source 
Bug: 66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6
This commit is contained in:
jackqdyulei
2017-09-22 13:27:23 -07:00
parent 17acd3d1c8
commit 0b6a3bc9c4
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,7 +338,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
return usageType == UsageType.CELL return usageType == UsageType.CELL
|| usageType == UsageType.BLUETOOTH || usageType == UsageType.BLUETOOTH
|| usageType == UsageType.WIFI || usageType == UsageType.WIFI
|| usageType == UsageType.APP; || usageType == UsageType.APP
|| usageType == UsageType.SYSTEM;
} }
@VisibleForTesting @VisibleForTesting

11
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
View File

@@ -133,7 +133,7 @@ public class PowerUsageAdvancedTest {
when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn( when(mShadowContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
mConnectivityManager); mConnectivityManager);
mPowerUsageData = new PowerUsageData(UsageType.SYSTEM); mPowerUsageData = new PowerUsageData(UsageType.USER);
mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE; mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
mMaxBatterySipper.drainType = DrainType.BLUETOOTH; mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
mNormalBatterySipper.drainType = DrainType.SCREEN; mNormalBatterySipper.drainType = DrainType.SCREEN;
@@ -341,6 +341,13 @@ public class PowerUsageAdvancedTest {
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue(); assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
} }
@Test
public void testShouldHideSummary_typeSystem_returnTrue() {
mPowerUsageData.usageType = UsageType.SYSTEM;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
}
@Test @Test
public void testShouldHideSummary_typeWifi_returnTrue() { public void testShouldHideSummary_typeWifi_returnTrue() {
mPowerUsageData.usageType = UsageType.WIFI; mPowerUsageData.usageType = UsageType.WIFI;
@@ -364,7 +371,7 @@ public class PowerUsageAdvancedTest {
@Test @Test
public void testShouldHideSummary_typeNormal_returnFalse() { public void testShouldHideSummary_typeNormal_returnFalse() {
mPowerUsageData.usageType = UsageType.SYSTEM; mPowerUsageData.usageType = UsageType.IDLE;
assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse(); assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
} }