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

am: 0f058759b0 Change-Id: I455b85ffe3af699d5206a577931f87a2777a5779
2017-10-06 18:13:11 +00:00 · 2017-10-06 18:13:11 +00:00 · fc3f7ec5c3
parent 791af78e96 0f058759b0
commit fc3f7ec5c3
1 changed files with 1 additions and 1 deletions
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@ -570,7 +570,7 @@ std::string BootReasonStrToReason(const std::string& boot_reason) {
    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);
      }
    }