From 83b2f7d875f01ce710986f8c0699381b7c3e530b Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Thu, 15 Jul 2021 17:05:50 -0700 Subject: [PATCH] Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER. HWASan builds often fail to complete stack dump in time. Bug: 193568145 Test: am hang; look for "ActivityManager: Done dumping" in logcat Change-Id: Ied3a2def89cb1bb5c6a9d51ddf8fb112cb0b4133 --- .../core/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index eed3141621a81..812eafba35d2d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4133,7 +4133,7 @@ public class ActivityManagerService extends IActivityManager.Stub // control of all writes to the file in question. // We must complete all stack dumps within 20 seconds. - long remainingTime = 20 * 1000; + long remainingTime = 20 * 1000 * Build.HW_TIMEOUT_MULTIPLIER; // As applications are usually interested with the ANR stack traces, but we can't share with // them the stack traces other than their own stacks. So after the very first PID is