Commit: 699e342b3d77c4e2b7e856621e1ce1150859582f - system-core (git)

system/core

Commit MetaInfo

• Révision: 699e342b3d77c4e2b7e856621e1ce1150859582f (tree)
• l'heure: 2019-05-23 01:46:02
• Auteur: Wei Wang <wvw@goog...>
• Commiter: Wei Wang

Message de Log

Report non-empty system boot reason when bootloader reason is empty

Bug: 133321647
Test: build
Change-Id: Icd3ea4b69ef2ad040926e2b0e121a8f5f1c1b658

Change Summary

• modified: bootstat/bootstat.cpp

Modification

--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -1086,17 +1086,8 @@ void RecordAbsoluteBootTime(BootEventRecordStore* boot_event_store,
 void LogBootInfoToStatsd(std::chrono::milliseconds end_time,
                          std::chrono::milliseconds total_duration, int32_t bootloader_duration_ms,
                          double time_since_last_boot_sec) {
-  const auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "");
-
-  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, "");
+  auto reason = android::base::GetProperty(bootloader_reboot_reason_property, "<EMPTY>");
+  auto system_reason = android::base::GetProperty(system_reboot_reason_property, "<EMPTY>");
   android::util::stats_write(android::util::BOOT_SEQUENCE_REPORTED, reason.c_str(),
                              system_reason.c_str(), end_time.count(), total_duration.count(),
                              (int64_t)bootloader_duration_ms,