Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT MERGE] Better timestamp for shutdown and startup events.

Browse Source 
Fix the bug that during android P to Q upgrade, DEVICE_SHUTDOWN
event mistakenly gets a newer timestamp than DEVICE_STARTUP event.

Bug: 139656029
Test: flash the device with android P, then upgrade to android Q,
then "adb shell dumpsys usagestats", observe DEVICE_SHUTDOWN
is before DEVICE_STARTUP.

Change-Id: I5429fe7648529be8379270adefd26bd98a31357c
This commit is contained in:
Hui Yu
2019-09-03 17:45:49 -07:00
parent 402c7bb521
commit 8d83364c5f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/usage/java/com/android/server/usage/UserUsageStatsService.java
View File

@@ -136,17 +136,16 @@ class UserUsageStatsService {
}
// During system reboot, add a DEVICE_SHUTDOWN event to the end of event list, the timestamp
// is last time UsageStatsDatabase is persisted to disk.
// is last time UsageStatsDatabase is persisted to disk or the last event's time whichever
// is higher (because the file system timestamp is round down to integral seconds).
// Also add a DEVICE_STARTUP event with current system timestamp.
final IntervalStats currentDailyStats = mCurrentStats[INTERVAL_DAILY];
if (currentDailyStats != null) {
// File system timestamp only has precision of 1 second, add 1000ms to make up
// for the loss of round up.
final Event shutdownEvent =
new Event(DEVICE_SHUTDOWN, currentDailyStats.lastTimeSaved + 1000);
final Event shutdownEvent = new Event(DEVICE_SHUTDOWN,
Math.max(currentDailyStats.lastTimeSaved, currentDailyStats.endTime));
shutdownEvent.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;
currentDailyStats.addEvent(shutdownEvent);
final Event startupEvent = new Event(DEVICE_STARTUP, currentTimeMillis);
final Event startupEvent = new Event(DEVICE_STARTUP, System.currentTimeMillis());
startupEvent.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;
currentDailyStats.addEvent(startupEvent);
}