diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-03-10 09:08:02 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2020-03-16 09:20:22 -0700 |
| commit | 0188274148f1462bfdc1c95457a44e2458fffa5a (patch) | |
| tree | 6c415f45dd8584eff1817d2697000708fcd438a5 /init/sigchld_handler.cpp | |
| parent | e4e0566e0268d13f6a23a87c946d235bd1fba57f (diff) | |
Revert "init: handle property service callbacks asynchronously"
This is apparently causing problems with reboot.
This reverts commit d2dab830d3ec260ccd982d147d4eb0ef74071261.
Bug: 150863651
Test: build
Merged-In: Ib8a4835cdc8358a54c7acdebc5c95038963a0419
Change-Id: Ib8a4835cdc8358a54c7acdebc5c95038963a0419
Diffstat (limited to 'init/sigchld_handler.cpp')
| -rw-r--r-- | init/sigchld_handler.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/init/sigchld_handler.cpp b/init/sigchld_handler.cpp index 064d64d54..9b2c7d939 100644 --- a/init/sigchld_handler.cpp +++ b/init/sigchld_handler.cpp @@ -64,8 +64,6 @@ static pid_t ReapOneProcess() { std::string wait_string; Service* service = nullptr; - auto lock = std::lock_guard{service_lock}; - if (SubcontextChildReap(pid)) { name = "Subcontext"; } else { |