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

Merge "Include type service as type system" into oc-dev am: 72ca5b0bb2

Browse Source 
am: aaaa4b4b42

Change-Id: I3d9b13c483fd7918f3f7b5858718c28cc77915ab
This commit is contained in:
jackqdyulei
2017-04-21 02:00:12 +00:00
committed by android-build-merger
parent 0969b8ff35 aaaa4b4b42
commit 949c116941
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,13 +140,13 @@ public class PowerUsageAdvancedTest {
}
@Test
public void testExtractUsageType_TypeService_ReturnService() {
public void testExtractUsageType_TypeService_ReturnSystem() {
mNormalBatterySipper.drainType = DrainType.APP;
when(mNormalBatterySipper.getUid()).thenReturn(FAKE_UID_1);
when(mPowerUsageFeatureProvider.isTypeService(any())).thenReturn(true);
assertThat(mPowerUsageAdvanced.extractUsageType(mNormalBatterySipper))
.isEqualTo(UsageType.SERVICE);
.isEqualTo(UsageType.SYSTEM);
}
@Test
@@ -210,8 +210,8 @@ public class PowerUsageAdvancedTest {
final int[] usageTypeSet = mPowerUsageAdvanced.mUsageTypes;
assertThat(usageTypeSet).asList().containsExactly(UsageType.APP, UsageType.WIFI,
UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.SERVICE,
UsageType.USER, UsageType.SYSTEM, UsageType.UNACCOUNTED, UsageType.OVERCOUNTED);
UsageType.CELL, UsageType.BLUETOOTH, UsageType.IDLE, UsageType.USER,
UsageType.SYSTEM, UsageType.UNACCOUNTED, UsageType.OVERCOUNTED);
}
@Test