Merge "Fix UsageStats begin and end timestamp bug." (ff671494) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsProtoV2.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}