commit fc3f7ec5c387ade0f1b32f1b86e95e61429be22b
author Mark Salyzyn <salyzyn@google.com> Fri Oct 06 18:13:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 18:13:11 2017 +0000
tree 1bb303d2eea1df39eabe970bcc429eb73e46b83a
parent 791af78e9621fd1a44ac07c28ae0234aade38fa5
parent 0f058759b037d714f29caf3185e3f40a14cee84d

Merge "bootstat: system_boot_reason does not handle reboot_<reason> case"
am: 0f058759b0

Change-Id: I455b85ffe3af699d5206a577931f87a2777a5779

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 17986b9..d26cf85 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -570,7 +570,7 @@
     ret = "reboot";
     if (android::base::StartsWith(reason, "reboot")) {
       reason = reason.substr(strlen("reboot"));
-      while (reason[0] == ',') {
+      while ((reason[0] == ',') || (reason[0] == '_')) {
         reason = reason.substr(1);
       }
     }