diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-02-05 03:16:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-05 03:16:30 +0000 |
commit | 54ef09c88e3b88b0f80d8aed760a78a5c99a701a (patch) | |
tree | 22780142fc6c4faafd44018d254a4f7a0d32bd75 /init/service.cpp | |
parent | a42af36002914dc2efe9589a334c72eb5225d1c5 (diff) | |
parent | 23aa17ba42e1403a993386964483ad417135df4b (diff) | |
download | system_core-54ef09c88e3b88b0f80d8aed760a78a5c99a701a.tar.gz system_core-54ef09c88e3b88b0f80d8aed760a78a5c99a701a.tar.bz2 system_core-54ef09c88e3b88b0f80d8aed760a78a5c99a701a.zip |
Merge "Reland: "Identify post-apexd crashing processes""
Diffstat (limited to 'init/service.cpp')
-rw-r--r-- | init/service.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/service.cpp b/init/service.cpp index 84cb2d88d..d64f2f395 100644 --- a/init/service.cpp +++ b/init/service.cpp @@ -375,7 +375,7 @@ void Service::Reap(const siginfo_t& siginfo) { // 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) { |