Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e92664f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Save foreground_service and cached consumed power in battery usage slot... 

Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev
parents 951bbde3 a93fd54d

src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java

+5 −2
Original line number Diff line number Diff line
@@ -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(

src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto

+5 −3
Original line number Diff line number Diff line
@@ -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;

}