diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java index ec0d01a4a85..a1987c9b8ad 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java @@ -473,6 +473,9 @@ public final class ConvertUtils { .setConsumePower(batteryDiffEntry.mConsumePower) .setForegroundUsageConsumePower(batteryDiffEntry.mForegroundUsageConsumePower) .setBackgroundUsageConsumePower(batteryDiffEntry.mBackgroundUsageConsumePower) + .setForegroundServiceUsageConsumePower( + batteryDiffEntry.mForegroundServiceUsageConsumePower) + .setCachedUsageConsumePower(batteryDiffEntry.mCachedUsageConsumePower) .setForegroundUsageTime(batteryDiffEntry.mForegroundUsageTimeInMs) .setBackgroundUsageTime(batteryDiffEntry.mBackgroundUsageTimeInMs) .setScreenOnTime(batteryDiffEntry.mScreenOnTimeInMs); @@ -525,9 +528,9 @@ public final class ConvertUtils { batteryUsageDiff.getScreenOnTime(), batteryUsageDiff.getConsumePower(), batteryUsageDiff.getForegroundUsageConsumePower(), - /*foregroundServiceUsageConsumePower=*/ 0, + batteryUsageDiff.getForegroundServiceUsageConsumePower(), batteryUsageDiff.getBackgroundUsageConsumePower(), - /*cachedUsageConsumePower=*/ 0); + batteryUsageDiff.getCachedUsageConsumePower()); } static BatteryDiffData convertToBatteryDiffData( diff --git a/src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto b/src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto index e3b604ba0a7..5bc1a3e330e 100644 --- a/src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto +++ b/src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto @@ -26,7 +26,9 @@ message BatteryUsageDiff { optional double consume_power = 9; optional double foreground_usage_consume_power = 10; optional double background_usage_consume_power = 11; - optional int64 foreground_usage_time = 12; - optional int64 background_usage_time = 13; - optional int64 screen_on_time = 14; + optional double foreground_service_usage_consume_power = 12; + optional double cached_usage_consume_power = 13; + optional int64 foreground_usage_time = 14; + optional int64 background_usage_time = 15; + optional int64 screen_on_time = 16; }