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

Move enable-verity/disable-verity out of adb to a helper binary.

Test: adb enable-verity
Test: adb disable-verity
Test: adb shell enable-verity
Test: adb shell disable-verity
Test: fs_mgr/tests/adb-remount-test.sh
Change-Id: I0f21a6678b332cc9166d912aa38952d50d924566

adb/daemon/services.cpp

diff --git a/adb/daemon/services.cpp b/adb/daemon/services.cpp
index 181a8c5..e38bb00 100644
--- a/adb/daemon/services.cpp
+++ b/adb/daemon/services.cpp
@@ -55,7 +55,6 @@
 #include "daemon/framebuffer_service.h"
 #include "daemon/reboot_service.h"
 #include "daemon/restart_service.h"
-#include "daemon/set_verity_enable_state_service.h"
 #include "daemon/shell_service.h"
 
 
@@ -269,11 +268,11 @@
         return StartSubprocess("/system/bin/bu restore", nullptr, SubprocessType::kRaw,
                                SubprocessProtocol::kNone);
     } else if (name.starts_with("disable-verity:")) {
-        return create_service_thread("verity-on", std::bind(set_verity_enabled_state_service,
-                                                            std::placeholders::_1, false));
+        return StartSubprocess("/system/bin/disable-verity", nullptr, SubprocessType::kRaw,
+                               SubprocessProtocol::kNone);
     } else if (name.starts_with("enable-verity:")) {
-        return create_service_thread("verity-off", std::bind(set_verity_enabled_state_service,
-                                                             std::placeholders::_1, true));
+        return StartSubprocess("/system/bin/enable-verity", nullptr, SubprocessType::kRaw,
+                               SubprocessProtocol::kNone);
     } else if (android::base::ConsumePrefix(&name, "tcpip:")) {
         std::string str(name);