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

am: 9469df055e

Change-Id: Ia012f09dc8aea72b3803f4e552da5dd36fd92c89
This commit is contained in:
Zimuzo Ezeozue 2019-01-15 02:21:45 -08:00 committed by android-build-merger
commit 5d97b68fdf

View file

@ -406,7 +406,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) {