Merge "Skip recalculate all data in Periodic Job while multi-users." into main

2024-04-10 09:52:16 +00:00
parent db315e642b 4fcab412db
commit 2d874d3919
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
@@ -588,7 +588,8 @@ public class DataProcessManager {
                        lastFullChargeTime,
                        DatabaseUtils.BATTERY_LEVEL_RECORD_EVENTS);
        final long startTimestamp =
-                (batteryLevelRecordEvents.isEmpty() || !userIdsSeries.isMainUserProfileOnly())
+                (batteryLevelRecordEvents.isEmpty()
+                                || (!isFromPeriodJob && !userIdsSeries.isMainUserProfileOnly()))
                        ? lastFullChargeTime
                        : batteryLevelRecordEvents.get(0).getTimestamp();
        final BatteryLevelData batteryLevelData =