Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ea2bd3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." am: cf89aac2 am: 3c3fcf68 

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

Change-Id: Ic7d4f4ffd65cb05adc3225f90c083ea2aa01b354
parents 50395a12 3c3fcf68

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3355,7 +3355,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
        // control of all writes to the file in question.

        // control of all writes to the file in question.

















        // We must complete all stack dumps within 20 seconds.







        // 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







        // 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







        // them the stack traces other than their own stacks. So after the very first PID is