Merge "Fix UsageStats begin and end timestamp bug."

1 files changed, 8 insertions, 1 deletions

diff --git a/services/usage/java/com/android/server/usage/UsageStatsProtoV2.java b/services/usage/java/com/android/server/usage/UsageStatsProtoV2.java
index 7d8e430e5416..b68e04f9b29f 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsProtoV2.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsProtoV2.java
@@ -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;
             }
         }