commit 11fa6772e9ecd78e1582e86865a85f8c9ef5cc31
author Zimuzo Ezeozue <zezeozue@google.com> Tue Jan 15 02:21:45 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 02:21:45 2019 -0800
tree 2a3c9b439badee02cae60508092fe58e42dc9dab
parent fdb8c3d4f5334217b45cf585608f0251e1a59944
parent 14b9c71cf6396342692a9f513af06ad1dafac53b

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

Change-Id: Ia012f09dc8aea72b3803f4e552da5dd36fd92c89

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