commit 4fd4805cfa16ec506c51c2ee0136acedd88f96d8
author Zimuzo Ezeozue <zezeozue@google.com> Tue Jan 15 10:05:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 15 10:05:41 2019 +0000
tree a77ae582ecfdc3d193dc68ae704bb1863be60ace
parent 057a846860ed1135568682bac27d37bf3444c9fd
parent cd1b7d70cd8bf5e5d81bf339f137221629343688

Merge "Identify post-apexd crashing processes"

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index eec55c3..f3eafe4 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -406,7 +406,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) {