diff options
| author | Paul Crowley <paulcrowley@google.com> | 2018-03-01 23:24:20 +0000 |
|---|---|---|
| committer | Paul Crowley <paulcrowley@google.com> | 2018-03-01 23:24:20 +0000 |
| commit | e242a97db547dc73efea1b5287536be66637dc33 (patch) | |
| tree | 4abc4e3afeb7c3cd88e3fe75357377aca6669072 /init/service.cpp | |
| parent | 959b05553576ffc15da4334a5917ce763611ab82 (diff) | |
| download | system_core-e242a97db547dc73efea1b5287536be66637dc33.tar.gz system_core-e242a97db547dc73efea1b5287536be66637dc33.tar.bz2 system_core-e242a97db547dc73efea1b5287536be66637dc33.zip | |
Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."
This reverts commit 959b05553576ffc15da4334a5917ce763611ab82.
Reason for revert: b/73968735
Bug: 73968735
Test: b/73968735#comment5
Change-Id: Ifce4c029bab7380c60e20cc2b2885beb4a097456
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 bf780aa1a..a4e33f7ec 100644 --- a/init/service.cpp +++ b/init/service.cpp @@ -299,7 +299,7 @@ void Service::SetProcessAttributes() { } } -void Service::Reap(const siginfo_t& siginfo) { +void Service::Reap() { if (!(flags_ & SVC_ONESHOT) || (flags_ & SVC_RESTART)) { KillProcessGroup(SIGKILL); } @@ -308,10 +308,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; |