commit 277eca138b3cb5cc7e922483575799835f07e22c
author Mark Salyzyn <salyzyn@google.com> Mon Sep 11 15:22:57 2017 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Sep 12 12:24:02 2017 -0700
tree 6b3a4e59929ebcf0964324ecb98e86a52fa13fd4
parent b304f6d4e7752e08519a96aeaa936e36492afdc9

adb: reboot: last boot command default

For reboot [reboot_arg] requests via either reboot or adb reboot,
if reboot_arg is empty then report "shell" or "adb" respectively.

Test: boot_reason_test.sh shell_reboot adb_reboot
Bug: 63736262
Change-Id: Ie613d9e62db6a705885e4e7520aede27af3aa1b9

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index dbf71d3..ca34556 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -150,6 +150,7 @@
 
     sync();
 
+    if (!reboot_arg || !reboot_arg[0]) reboot_arg = "adb";
     std::string reboot_string = android::base::StringPrintf("reboot,%s", reboot_arg);
     if (!android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_string)) {
         WriteFdFmt(fd, "reboot (%s) failed\n", reboot_string.c_str());