commit ae5ce6f7c37be4c526f963b6f72e23717751a0c3
author Shrinidhi Hegde <shrinidhihegde@google.com> Thu Apr 04 19:19:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 04 19:19:04 2024 +0000
tree 2abe74995097f04f8ff193bb89647d54c1ca18f7
parent 1d928ca80b8a620374d9e21f17aba96664febef0

Revert "Update native watchdog to be triggered after 20 restarts instead of 4."

This reverts commit 1d928ca80b8a620374d9e21f17aba96664febef0.

Reason for revert: Breaks Host side CTS test https://android-build.corp.google.com/test_investigate/?referrer=buganizer&regressionId=manual-dcf4b8bc69179f9a6bc4ce097a552d84-1712255116&testResultId=TR13229242143019813&invocationId=I86200010262612788

Change-Id: I2627a0c5f5b8d9a19b6a43f678facc64ffa6c189

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 9ffab26..eb24dd5 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -352,19 +352,14 @@
     }
 #endif
 
-    // If we crash > 20 times in 'fatal_crash_window_' minutes or before boot_completed,
+    // If we crash > 4 times in 'fatal_crash_window_' minutes or before boot_completed,
     // reboot into bootloader or set crashing property
-    // Wait for 20 crashes so RescueParty has a chance to perform the
-    // mitigations. RescueParty finishes all its mitigations at 15 system_server
-    // restarts. If it is still crashing after all rescue party mitigations,
-    // reboot into bootloader.
-    constexpr int crash_count_threshold = 20;
     boot_clock::time_point now = boot_clock::now();
     if (((flags_ & SVC_CRITICAL) || is_process_updatable) && !(flags_ & SVC_RESTART) &&
         !was_last_exit_ok_) {
         bool boot_completed = GetBoolProperty("sys.boot_completed", false);
         if (now < time_crashed_ + fatal_crash_window_ || !boot_completed) {
-            if (++crash_count_ > crash_count_threshold) {
+            if (++crash_count_ > 4) {
                 auto exit_reason = boot_completed ?
                     "in " + std::to_string(fatal_crash_window_.count()) + " minutes" :
                     "before boot completed";