Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev (a0d61f25) · Commits · e / os / android_packages_apps_Settings

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -359,9 +359,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro
		componentId < BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID
		+ deviceConsumer.getCustomPowerComponentCount();
		componentId++) {
		if (!showAllApps
		&& mBatteryUtils.shouldHideCustomDevicePowerComponent(deviceConsumer,
		componentId)) {
		if (!showAllApps) {
		continue;
		}

+2 −16

Original line number	Diff line number	Diff line
		@@ -81,8 +81,6 @@ public class BatteryUtils {

		private static final String TAG = "BatteryUtils";

		private static final double MIN_POWER_THRESHOLD_MILLI_AMP_HOURS = 0.002;

		private static BatteryUtils sInstance;
		private PackageManager mPackageManager;

		@@ -180,8 +178,7 @@ public class BatteryUtils {
		* battery consumption list.
		*/
		public boolean shouldHideUidBatteryConsumer(UidBatteryConsumer consumer, String[] packages) {
		return consumer.getConsumedPower() < MIN_POWER_THRESHOLD_MILLI_AMP_HOURS
		\|\| mPowerUsageFeatureProvider.isTypeSystem(consumer.getUid(), packages)
		return mPowerUsageFeatureProvider.isTypeSystem(consumer.getUid(), packages)
		\|\| shouldHideUidBatteryConsumerUnconditionally(consumer, packages);
		}

		@@ -208,19 +205,8 @@ public class BatteryUtils {
		case BatteryConsumer.POWER_COMPONENT_WIFI:
		return true;
		default:
		return consumer.getConsumedPower(powerComponentId)
		< MIN_POWER_THRESHOLD_MILLI_AMP_HOURS;
		}
		return false;
		}

		/**
		* Returns true if the specified device custom power component should be excluded from the
		* summary battery consumption list.
		*/
		public boolean shouldHideCustomDevicePowerComponent(BatteryConsumer consumer,
		int customPowerComponentId) {
		return consumer.getConsumedPowerForCustomComponent(customPowerComponentId)
		< MIN_POWER_THRESHOLD_MILLI_AMP_HOURS;
		}

		/**

+1 −11

Original line number	Diff line number	Diff line
		@@ -246,17 +246,7 @@ public class BatteryUtilsTest {
		}

		@Test
		public void testShouldHideSystemConsumer_LowPower_ReturnTrue() {
		when(mAggregateBatteryConsumer.getConsumedPower(
		BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)).thenReturn(0.0005);
		assertThat(mBatteryUtils.shouldHideDevicePowerComponent(mAggregateBatteryConsumer,
		BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)).isTrue();
		}

		@Test
		public void testShouldHideSystemConsumer_HighPower_ReturnFalse() {
		when(mAggregateBatteryConsumer.getConsumedPower(
		BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)).thenReturn(0.5);
		public void testShouldHideSystemConsumer_OtherType_ReturnFalse() {
		assertThat(mBatteryUtils.shouldHideDevicePowerComponent(mAggregateBatteryConsumer,
		BatteryConsumer.POWER_COMPONENT_FLASHLIGHT)).isFalse();
		}