diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-02 01:26:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-02 01:26:32 +0000 |
| commit | b9ee9abebe631b02f312f1d2517305cf6ead159a (patch) | |
| tree | b4a5138a77e39f51537bf84c578e1492b7c9aa87 /init/service.cpp | |
| parent | c3892c045ff82d57b9e584acdf32a2d7e1652f33 (diff) | |
| parent | e242a97db547dc73efea1b5287536be66637dc33 (diff) | |
| download | system_core-b9ee9abebe631b02f312f1d2517305cf6ead159a.tar.gz system_core-b9ee9abebe631b02f312f1d2517305cf6ead159a.tar.bz2 system_core-b9ee9abebe631b02f312f1d2517305cf6ead159a.zip | |
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""
Diffstat (limited to 'init/service.cpp')
| -rw-r--r-- | init/service.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/init/service.cpp b/init/service.cpp index 09d8dae11..8130e73a9 100644 --- a/init/service.cpp +++ b/init/service.cpp @@ -303,7 +303,7 @@ void Service::SetProcessAttributes() { } } -void Service::Reap(const siginfo_t& siginfo) { +void Service::Reap() { if (!(flags_ & SVC_ONESHOT) || (flags_ & SVC_RESTART)) { KillProcessGroup(SIGKILL); } @@ -312,10 +312,6 @@ void Service::Reap(const siginfo_t& siginfo) { std::for_each(descriptors_.begin(), descriptors_.end(), std::bind(&DescriptorInfo::Clean, std::placeholders::_1)); - for (const auto& f : reap_callbacks_) { - f(siginfo); - } - if (flags_ & SVC_EXEC) UnSetExec(); if (flags_ & SVC_TEMPORARY) return; |