PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Save foreground_service and cached consumed power in battery usage slot datebase." into udc-qpr-dev am: 7e92664f52

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24689853

Change-Id: I6aa86815837a7be5fc76273a121c4060a12f5b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-09-13 04:39:21 +00:00
committed by Automerger Merge Worker
parent aa33b6586f 7e92664f52
commit aab57c0179
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
View File

@@ -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(

8
src/com/android/settings/fuelgauge/protos/battery_usage_slot.proto
View File

@@ -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;
}