commit 6f4e4db4f9e0911a07c6393d01e4380e844f7891
author Mark Salyzyn <salyzyn@google.com> Mon May 20 10:36:16 2019 -0700
committer Mark Salyzyn <salyzyn@google.com> Mon May 20 13:52:10 2019 -0700
tree c39c8c28b494d05bb4bcaf0ca4d8e6dff2a3cc95
parent e7a0262c14e7bccbb0575e6025987b5dee5739f0

recovery: report compliant reboot reason

shutdown and reboot should have a corresponding sub-reason.

Adding:
    "reboot,fastboot_menu"
    "reboot,recovery_menu"
    "reboot,recovery_ui"
    "shutdown,fastboot"
    "shutdown,recovery"
    "reboot,unknown#"

Test: none
Change-Id: Icf1ab0d462ec2de2272914a36994a095998d6186

otautil/sysutil.cpp

diff --git a/otautil/sysutil.cpp b/otautil/sysutil.cpp
index 420db4c..a882985 100644
--- a/otautil/sysutil.cpp
+++ b/otautil/sysutil.cpp
@@ -229,9 +229,9 @@
   return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd);
 }
 
-bool Shutdown() {
-  // "shutdown" doesn't need a "reason" arg nor a comma.
-  return android::base::SetProperty(ANDROID_RB_PROPERTY, "shutdown");
+bool Shutdown(std::string_view target) {
+  std::string cmd = "shutdown," + std::string(target);
+  return android::base::SetProperty(ANDROID_RB_PROPERTY, cmd);
 }
 
 std::vector<char*> StringVectorToNullTerminatedArray(const std::vector<std::string>& args) {