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

Commit 6da66f9a authored by Kuan Wang's avatar Kuan Wang
Browse files

Use (the last existing timestamp in DB + 1) as the start time of usage 

event query to avoid loading the same events repeatedly.

queryEvents API will return the events within [start, end). In the
hourly job, if we query the events from the latest existing time, the
events happening at the latest time will be saved for multiple times
into database. This aims to avoid this issue.

Test: make RunSettingsRoboTests
Bug: 265110147
Fix: 265110147
Change-Id: I408e88b0e15fe22585906261935854cf47707f9c
parent 89e5b837

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

+3 −1
Original line number Diff line number Diff line
@@ -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. */

tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public final class DatabaseUtilsTest { 


        final long earliestTimestamp1 = 1001L;

        assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(

                mContext, /*userId=*/ 0, earliestTimestamp1)).isEqualTo(returnedTimestamp);

                mContext, /*userId=*/ 0, earliestTimestamp1)).isEqualTo(returnedTimestamp + 1);

        final long earliestTimestamp2 = 100001L;

        assertThat(DatabaseUtils.getAppUsageStartTimestampOfUser(

                mContext, /*userId=*/ 0, earliestTimestamp2)).isEqualTo(earliestTimestamp2);