Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2dab59 authored by James Hawkins's avatar James Hawkins Committed by android-build-merger
Browse files

Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." am: 45d0cbf0 

am: 9fb006b5

Change-Id: Ie19ee731bfc9f7927ed70409524dec081c8a001b
parents 3d2aa93e 9fb006b5

bootstat/bootstat.cpp

+5 −3
Original line number Diff line number Diff line
@@ -201,8 +201,10 @@ std::string CalculateBootCompletePrefix() { 


  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 @@ const BootloaderTimingMap GetBootLoaderTimings() { 
  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;