commit be3b5b8270509ecd929d46ceb04f4e6079acdedd
author Zimuzo Ezeozue <zezeozue@google.com> Mon Feb 04 20:11:43 2019 +0000
committer Zimuzo Ezeozue <zezeozue@google.com> Mon Feb 04 21:41:12 2019 +0000
tree e624db058a3485c0757ce94a7fb2b33f423836ea
parent 8840a6e8258e2352beae34011faf957cdfbadaa5

Reland: "Identify post-apexd crashing processes"

This reverts commit 60b89aee4c00020124732a82095663d4b5a9aefb.

Reason for revert: Blocking change merged, Icdfbdcc1efca540ac854d4df79e07ee61fca559f

Change-Id: Iec7f0b28ca3326d1dc1d86304751eee5e941235e

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 272809f..638dc5a 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -369,7 +369,7 @@
 
     // If we crash > 4 times in 4 minutes, reboot into bootloader or set crashing property
     boot_clock::time_point now = boot_clock::now();
-    if (((flags_ & SVC_CRITICAL) || classnames_.count("updatable")) && !(flags_ & SVC_RESTART)) {
+    if (((flags_ & SVC_CRITICAL) || !pre_apexd_) && !(flags_ & SVC_RESTART)) {
         if (now < time_crashed_ + 4min) {
             if (++crash_count_ > 4) {
                 if (flags_ & SVC_CRITICAL) {