commit 2c356bb91ebf146489913cef713392987c3e811b
author Josh Gao <jmgao@google.com> Tue Oct 22 12:30:36 2019 -0700
committer Josh Gao <jmgao@google.com> Wed Oct 23 14:33:36 2019 -0700
tree 5f87f615a5efbf6b35dbc48fb14e0646907aa01b
parent f61f41494e5106dbbcddd568001485306bd32937

adb: replace reboot service with exec of /system/bin/reboot.

Test: adb reboot
Test: adb reboot fastboot
Change-Id: Ia4146dde7ef3ae00a782dbe68aff166d63eabdb9

adb/daemon/services.cpp

diff --git a/adb/daemon/services.cpp b/adb/daemon/services.cpp
index e38bb00..a44c10b 100644
--- a/adb/daemon/services.cpp
+++ b/adb/daemon/services.cpp
@@ -53,7 +53,6 @@
 
 #include "daemon/file_sync_service.h"
 #include "daemon/framebuffer_service.h"
-#include "daemon/reboot_service.h"
 #include "daemon/restart_service.h"
 #include "daemon/shell_service.h"
 
@@ -253,9 +252,9 @@
         cmd += name;
         return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
     } else if (android::base::ConsumePrefix(&name, "reboot:")) {
-        std::string arg(name);
-        return create_service_thread("reboot",
-                                     std::bind(reboot_service, std::placeholders::_1, arg));
+        std::string cmd = "/system/bin/reboot ";
+        cmd += name;
+        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
     } else if (name.starts_with("root:")) {
         return create_service_thread("root", restart_root_service);
     } else if (name.starts_with("unroot:")) {