Merge "Replace Screen system component time with device screen on time" into udc-dev

2023-04-25 03:32:02 +00:00
parent cfa374f997 1237a70c96
commit f3a3634aa5
2 changed files with 10 additions and 5 deletions
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -1402,6 +1402,11 @@ public final class DataProcessor {
                                currentEntry.mCachedUsageConsumePower,
                                nextEntry.mCachedUsageConsumePower);
            }
+            if (selectedBatteryEntry.isSystemEntry()
+                    && selectedBatteryEntry.mDrainType == BatteryConsumer.POWER_COMPONENT_SCREEN) {
+                // Replace Screen system component time with screen on time.
+                foregroundUsageTimeInMs = slotScreenOnTime;
+            }
            // Excludes entry since we don't have enough data to calculate.
            if (foregroundUsageTimeInMs == 0
                    && backgroundUsageTimeInMs == 0