commit 959b05553576ffc15da4334a5917ce763611ab82
author Paul Crowley <paulcrowley@google.com> Tue Feb 13 17:09:08 2018 -0800
committer Paul Crowley <paulcrowley@google.com> Thu Feb 15 10:23:52 2018 -0800
tree c293ae0483137406d401de6874785466bfac3210
parent 0ce76f910b1794d422f8d45d77a3ee2b95ec3d3e

If enablefilecrypto or init_user0 fails, reboot into recovery.

Test: Roll back PLATFORM_SECURITY_PATCH, ensure recovery dialog is seen
Bug: 70487538
Change-Id: Iceb6af3f9d6aea6bc646dbb4b5d29dffcb284736

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index a4e33f7..bf780aa 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -299,7 +299,7 @@
     }
 }
 
-void Service::Reap() {
+void Service::Reap(const siginfo_t& siginfo) {
     if (!(flags_ & SVC_ONESHOT) || (flags_ & SVC_RESTART)) {
         KillProcessGroup(SIGKILL);
     }
@@ -308,6 +308,10 @@
     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;