Merge "Reland: "Identify post-apexd crashing processes""

This commit is contained in:
Treehugger Robot 2019-02-05 03:16:30 +00:00 committed by Gerrit Code Review
commit 54ef09c88e

View file

@ -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 // If we crash > 4 times in 4 minutes, reboot into bootloader or set crashing property
boot_clock::time_point now = boot_clock::now(); 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 (now < time_crashed_ + 4min) {
if (++crash_count_ > 4) { if (++crash_count_ > 4) {
if (flags_ & SVC_CRITICAL) { if (flags_ & SVC_CRITICAL) {