From a485d8dfd509d01c8df88c5f6ab6be5f3f0f30c8 Mon Sep 17 00:00:00 2001 From: Dmitri Plotnikov Date: Fri, 23 Apr 2021 14:27:37 -0700 Subject: [PATCH] Replace TIME_COMPONENT_... constants with POWER_COMPONENT_ constants Bug: 186006876 Test: make RunSettingsRoboTests Change-Id: I873fa5a492dfcddbb65004c30764d1bf8911f78f --- .../fuelgauge/BatteryAppListPreferenceController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 68ad74dbffb..b09dfd59faf 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -427,7 +427,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro } private BatteryUsageStats getFakeStats() { - BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[0], 0) + BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(new String[0]) .setDischargePercentage(100); float use = 500; @@ -460,18 +460,18 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro // Simulate dex2oat process. builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID)) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000) + .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CPU, 100000) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0) .setPackageWithHighestDrain("dex2oat"); builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID + 1)) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000) + .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CPU, 100000) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 1000.0) .setPackageWithHighestDrain("dex2oat"); builder.getOrCreateUidBatteryConsumerBuilder( new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID))) - .setUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_CPU, 100000) + .setUsageDurationMillis(BatteryConsumer.POWER_COMPONENT_CPU, 100000) .setConsumedPower(BatteryConsumer.POWER_COMPONENT_CPU, 900.0); return builder.build();