commit 445295b04e72a8177f27826c563e5a50503db57e
author Zimuzo Ezeozue <zezeozue@google.com> Tue Jan 15 02:29:25 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 02:29:25 2019 -0800
tree 675b21cd73280970cf1fbd93d52e65a1e9ecb2a9
parent 9a1e44579f1794e0b9dd058a586e6360bacdcb4f
parent 5d97b68fdf6ff00567133c493449d49a059fe5fb

Merge "Identify post-apexd crashing processes" am: 91fa140312 am: 9469df055e
am: 5d97b68fdf

Change-Id: Id1cdfce8c2225b8ec98eb0ff210643e5ab1be006

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) {