commit 0af71a53278677648315b7413f725526f7606852
author Mark Salyzyn <salyzyn@google.com> Thu Oct 05 13:58:04 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Oct 05 14:42:08 2017 -0700
tree 9f3347f5d2d01b06beea3ea9d62da95786d7434a
parent 9e6c11da18267ffe27f7be06ce5a04fe321645a3

bootstat: system_boot_reason does not handle reboot_<reason> case

Heuristic would translate reboot_<reason> to reboot._<reason>. Add
checking/squashing for leading comma (,) _or_ underscore (_).

Test: compile
Bug: 63736262
Change-Id: I7ef4930ec8c064a8151183ac08d292931a8584c8

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