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

Merge "Fix UsageStats begin and end timestamp bug."

Browse Source
This commit is contained in:
Varun Shah
2019-11-05 00:37:47 +00:00
committed by Android (Google) Code Review
parent 3384242a7e 08d81706b9
commit ff671494e5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/usage/java/com/android/server/usage/UsageStatsProtoV2.java
View File

@@ -448,10 +448,10 @@ final class UsageStatsProtoV2 {
final long packagesToken = proto.start(
IntervalStatsObfuscatedProto.PACKAGES);
UsageStats usageStats = parseUsageStats(proto, stats.beginTime);
proto.end(packagesToken);
if (usageStats.mPackageToken != PackagesTokenData.UNASSIGNED_TOKEN) {
stats.packageStatsObfuscated.put(usageStats.mPackageToken, usageStats);
}
proto.end(packagesToken);
} catch (IOException e) {
Slog.e(TAG, "Unable to read some usage stats from proto.", e);
}
@@ -484,6 +484,13 @@ final class UsageStatsProtoV2 {
if (stats.endTime == 0) {
stats.endTime = stats.beginTime;
}
// update the begin and end time stamps for all usage stats
final int usageStatsSize = stats.packageStatsObfuscated.size();
for (int i = 0; i < usageStatsSize; i++) {
final UsageStats usageStats = stats.packageStatsObfuscated.valueAt(i);
usageStats.mBeginTimeStamp = stats.beginTime;
usageStats.mEndTimeStamp = stats.endTime;
}
return;
}
}