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

Commit 6deec990 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "Report non-empty system boot reason when bootloader reason is empty"... 

Merge "Report non-empty system boot reason when bootloader reason is empty" into qt-dev am: c39fcd42
am: f5730912

Change-Id: I56d7e6f5e80cf39858434ae7fcb7009e5fbdb40b
parents c5f71bc8 f5730912

bootstat/bootstat.cpp

+2 −11
Original line number Original line Diff line number Diff line
@@ -1092,17 +1092,8 @@ void RecordAbsoluteBootTime(BootEventRecordStore* boot_event_store, 
void LogBootInfoToStatsd(std::chrono::milliseconds end_time,

void LogBootInfoToStatsd(std::chrono::milliseconds end_time,

                         std::chrono::milliseconds total_duration, int32_t bootloader_duration_ms,

                         std::chrono::milliseconds total_duration, int32_t bootloader_duration_ms,

                         double time_since_last_boot_sec) {

                         double time_since_last_boot_sec) {

  const auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "");

  auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "<EMPTY>");



  auto system_reason = android::base::GetProperty(system_reboot_reason_property, "<EMPTY>");

  if (reason.empty()) {

    android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, "<EMPTY>", "<EMPTY>",

                               end_time.count(), total_duration.count(),

                               (int64_t)bootloader_duration_ms,

                               (int64_t)time_since_last_boot_sec * 1000);

    return;

  }



  const auto system_reason = android::base::GetProperty(system_reboot_reason_property, "");

  android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, reason.c_str(),

  android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, reason.c_str(),

                             system_reason.c_str(), end_time.count(), total_duration.count(),

                             system_reason.c_str(), end_time.count(), total_duration.count(),

                             (int64_t)bootloader_duration_ms,

                             (int64_t)bootloader_duration_ms,