commit 543793fd30ac8efda8ffdba1435daadd46600e95
author Zimuzo Ezeozue <zezeozue@google.com> Mon Feb 04 22:09:19 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 04 22:09:19 2019 -0800
tree 8e437dcc04cab7f1c0850e14b983749feb6da619
parent e7ac23ab61c20ac296bad1785dfdff8b891fac79
parent 5759b591fbd68e3ccdd772de5ace6975627db9df

Merge "Reland: "Identify post-apexd crashing processes"" am: 54ef09c88e
am: 58386c1e6e

Change-Id: Iebe1167c43f883a8d105bd856ab266163918be07

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 84cb2d8..d64f2f3 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -375,7 +375,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) {