commit 8ecba66396aadab56661f1d0aaed2a08f6364b14
author James Hawkins <jhawkins@google.com> Wed May 31 00:12:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 31 00:12:41 2017 +0000
tree 5febed1a81e679e86f5511602c4691c05939d370
parent 5c2ea2d0332753b1caf4099b406783122235fa69
parent 657858fe6891f1c6e0516a71a04ee90bc4427082

Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." am: 45d0cbf00b am: 9fb006b57a
am: aa2dab59af

Change-Id: I093eec686f4d7ed5474ed84014ce033fcc01d961

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index d4e215e..a4c2160 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -201,8 +201,10 @@
 
   BootEventRecordStore boot_event_store;
   BootEventRecordStore::BootEventRecord record;
-  if (!boot_event_store.GetBootEvent(kBuildDateKey, &record) ||
-      build_date != record.second) {
+  if (!boot_event_store.GetBootEvent(kBuildDateKey, &record)) {
+    boot_complete_prefix = "factory_reset_" + boot_complete_prefix;
+    boot_event_store.AddBootEventWithValue(kBuildDateKey, build_date);
+  } else if (build_date != record.second) {
     boot_complete_prefix = "ota_" + boot_complete_prefix;
     boot_event_store.AddBootEventWithValue(kBuildDateKey, build_date);
   }
@@ -241,7 +243,7 @@
   for (const auto& stageTiming : stages) {
     // |stageTiming| is of the form 'stage:time'.
     auto stageTimingValues = android::base::Split(stageTiming, ":");
-    DCHECK_EQ(2, stageTimingValues.size());
+    DCHECK_EQ(2U, stageTimingValues.size());
 
     std::string stageName = stageTimingValues[0];
     int32_t time_ms;