commit c244ac8d6cb0ef8e6421e69f57b3b03ca77f75ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Apr 19 21:15:40 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 21:15:40 2024 +0000
tree c0de8db28986c18fd4a6603138dfcef9c3696a1a
parent 8a3083a209a1b00469bfeaa7b9efb687fa8bc807
parent 21492dcd91c86fa06c423fbe60876a219421892f

Merge "Don't throw ANR if onTimeout flag is disabled." into main

services/core/java/com/android/server/am/ActiveServices.java

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 26e9bf5..2fa0be2 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3867,8 +3867,10 @@
                 Slog.w(TAG_SERVICE, "Exception from scheduleTimeoutServiceForType: " + e);
             }
 
-            // ANR the service after giving the service some time to clean up.
-            mFGSAnrTimer.start(sr, mAm.mConstants.mFgsAnrExtraWaitDuration);
+            if (android.app.Flags.introduceNewServiceOntimeoutCallback()) {
+                // ANR the service after giving the service some time to clean up.
+                mFGSAnrTimer.start(sr, mAm.mConstants.mFgsAnrExtraWaitDuration);
+            }
         }
     }