commit 5cdd1f590af04b8dc94321d7dd63ad30058bbf86
author Mark Salyzyn <salyzyn@google.com> Fri Oct 06 18:17:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 18:17:37 2017 +0000
tree 14064abad176a059d29b42071455462029360e6d
parent 1f40228d644ca2e991bd1bb34ca9bf3120dc3767
parent fc3f7ec5c387ade0f1b32f1b86e95e61429be22b

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

Change-Id: Ifb12695091749ada0d8348555b04a85ca3385434

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);
       }
     }