commit 24f4df0bb22804e27a3e307dcb7b64d65c7badc8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 07 18:54:50 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 07 18:54:50 2024 +0000
tree 0489cdc2003403d275fc3745e0631007677ff164
parent c0e2cc30d271c3581f95af9462cb47b40cde25ee
parent 0c78cf96a10478505059f9bcec7aa37ade8cf20f

Merge "bootstat: Remove long key press check" into main am: 0c78cf96a1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2938819

Change-Id: Iad1cf5e839fc9c7009676aa516c0550bd3c788d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 2d55e5a..85a9935 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -1079,12 +1079,7 @@
       }
 
       // Check for kernel panics, allowed to override reboot command.
-      if (!addKernelPanicSubReason(console, ret) &&
-          // check for long-press power down
-          ((console.rfind("Power held for ") != std::string::npos) ||
-           (console.rfind("charger: [") != std::string::npos))) {
-        ret = "cold";
-      }
+      (void)addKernelPanicSubReason(console, ret);
     }
 
     // TODO: use the HAL to get battery level (http://b/77725702).