commit ab8c8a1b31f8ecb7f407abb8ee3b83f4606453cc
author Jason Chiu <jasoncschiu@google.com> Tue Jan 21 10:46:15 2025 +0800
committer Jason Chiu <jasoncschiu@google.com> Thu Feb 06 22:49:51 2025 -0800
tree 1f1c08026a03e1efd0c62bfe81569c1a3c40dad8
parent babce93c60d334f92d7223367c477d2d9c14ffca

bootstat: refine sys.boot.reason if device boot up from shipmode

- skip BootReasonStrToReason() if device boot up from shipmode
- skip BootReasonAddToHistory() if device boot up from shipmode
  and system_boot_reason is factory_reset or ota

Bug: 349723310
Test: verify sys.boot.reason work as expected if
      device boot up from shipmode
Change-Id: I4279deae8c14977c684b5b77035f16fb1b20ed71
Signed-off-by: Jason Chiu <jasoncschiu@google.com>

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 3c8c4b4..96c5b81 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -913,6 +913,19 @@
 void BootReasonAddToHistory(const std::string& system_boot_reason) {
   if (system_boot_reason.empty()) return;
   LOG(INFO) << "Canonical boot reason: " << system_boot_reason;
+
+  // skip system_boot_reason(factory_reset, ota) shift since device boot up from shipmode
+  const auto bootloader_boot_reason =
+      android::base::GetProperty(bootloader_reboot_reason_property, "");
+  const char reg_fship[] = ".*fship.*";
+  if (std::regex_search(bootloader_boot_reason, std::regex(reg_fship)) != 0) {
+    if (system_boot_reason == "reboot,factory_reset" || system_boot_reason == "reboot,ota") {
+      LOG(INFO) << "skip boot reason (" << system_boot_reason
+                << ") shift since device boot up from shipmode.";
+      return;
+    }
+  }
+
   auto old_system_boot_reason = android::base::GetProperty(system_reboot_reason_property, "");
   if (!android::base::SetProperty(system_reboot_reason_property, system_boot_reason)) {
     android::base::SetProperty(system_reboot_reason_property,
@@ -954,6 +967,14 @@
 std::string BootReasonStrToReason(const std::string& boot_reason) {
   auto ret = android::base::GetProperty(system_reboot_reason_property, "");
   std::string reason(boot_reason);
+
+  // skip BootReasonStrToReason() if device boot up from shipmode
+  const char reg_fship[] = ".*fship.*";
+  if (reason == ret && std::regex_search(reason, std::regex(reg_fship)) != 0) {
+    LOG(INFO) << "skip boot reason enhancement if device boot up from shipmode";
+    return ret;
+  }
+
   // If sys.boot.reason == ro.boot.bootreason, let's re-evaluate
   if (reason == ret) ret = "";