Merge "Reland: "Identify post-apexd crashing processes"" am: 54ef09c88e

am: 58386c1e6e

Change-Id: Iebe1167c43f883a8d105bd856ab266163918be07
This commit is contained in:
Zimuzo Ezeozue 2019-02-04 22:09:19 -08:00 committed by android-build-merger
commit 5086e9c919

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