Merge "Include type service as type system" into oc-dev am: 72ca5b0bb2 (949c1169) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

+8 −14

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		final int[] mUsageTypes = {
		UsageType.WIFI,
		UsageType.CELL,
		UsageType.SERVICE,
		UsageType.SYSTEM,
		UsageType.BLUETOOTH,
		UsageType.USER,
		@@ -207,10 +206,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		return UsageType.UNACCOUNTED;
		} else if (drainType == DrainType.OVERCOUNTED) {
		return UsageType.OVERCOUNTED;
		} else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)) {
		} else if (mPowerUsageFeatureProvider.isTypeSystem(sipper)
		\|\| mPowerUsageFeatureProvider.isTypeService(sipper)) {
		return UsageType.SYSTEM;
		} else if (mPowerUsageFeatureProvider.isTypeService(sipper)) {
		return UsageType.SERVICE;
		} else {
		return UsageType.APP;
		}
		@@ -328,7 +326,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		@IntDef({UsageType.APP,
		UsageType.WIFI,
		UsageType.CELL,
		UsageType.SERVICE,
		UsageType.SYSTEM,
		UsageType.BLUETOOTH,
		UsageType.USER,
		@@ -339,13 +336,12 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		int APP = 0;
		int WIFI = 1;
		int CELL = 2;
		int SERVICE = 3;
		int SYSTEM = 4;
		int BLUETOOTH = 5;
		int USER = 6;
		int IDLE = 7;
		int UNACCOUNTED = 8;
		int OVERCOUNTED = 9;
		int SYSTEM = 3;
		int BLUETOOTH = 4;
		int USER = 5;
		int IDLE = 6;
		int UNACCOUNTED = 7;
		int OVERCOUNTED = 8;
		}

		@StringRes
		@@ -379,8 +375,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
		return R.string.power_wifi;
		case UsageType.CELL:
		return R.string.power_cell;
		case UsageType.SERVICE:
		return R.string.power_service;
		case UsageType.SYSTEM:
		return R.string.power_system;
		case UsageType.BLUETOOTH:

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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