Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." am: cf89aac24b am: 3c3fcf6865 am: 8ea2bd3c2e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768622

Change-Id: I53e8c14949999899d497cb7c86f369ca35057343
This commit is contained in:
Treehugger Robot
2021-07-20 18:30:14 +00:00
committed by Automerger Merge Worker

View File

@@ -3355,7 +3355,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