Merge "Use (the last existing timestamp in DB + 1) as the start time of usage event query to avoid loading the same events repeatedly."

2023-01-11 10:51:40 +00:00
parent 4ef920e9ef 6da66f9a5c
commit 569becdb7f
2 changed files with 4 additions and 2 deletions
--- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
@@ -125,7 +125,9 @@ public final class DatabaseUtils {
        Log.d(TAG, String.format(
                "getAppUsageStartTimestampOfUser() userId=%d latestTimestamp=%d in %d/ms",
                userId, latestTimestamp, (System.currentTimeMillis() - startTime)));
-        return Math.max(latestTimestamp, earliestTimestamp);
+        // Use (latestTimestamp + 1) here to avoid loading the events of the latestTimestamp
+        // repeatedly.
+        return Math.max(latestTimestamp + 1, earliestTimestamp);
    }

    /** Returns the current user data in app usage event table. */