commit 3b81f2d623c6cba45ad07fa91338d346d9b96482
author Tom Cherry <tomcherry@google.com> Fri Jul 28 14:48:41 2017 -0700
committer Tom Cherry <tomcherry@google.com> Tue Aug 01 11:06:04 2017 -0700
tree 2cce7c9eb83f99d12e464d7919e76b1f61602ca8
parent d269e3a795fbb0ecb7b2c6dff720f9b356365a22

init: move exec operations out of ServiceManager

These can be implemented without ServiceManager, so we remove them and
make ServiceManager slightly less of a God class.

Test: boot bullhead
Test: init unit tests
Change-Id: Ia6e546fe5292255412245256f7d230af4ece135f

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 03f0bb7..a12afae 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -1180,10 +1180,10 @@
         // By default, sleep until something happens.
         int epoll_timeout_ms = -1;
 
-        if (!(waiting_for_prop || sm.IsWaitingForExec())) {
+        if (!(waiting_for_prop || Service::is_exec_service_running())) {
             am.ExecuteOneCommand();
         }
-        if (!(waiting_for_prop || sm.IsWaitingForExec())) {
+        if (!(waiting_for_prop || Service::is_exec_service_running())) {
             if (!shutting_down) {
                 auto next_process_restart_time = RestartProcesses();