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

Commit 45c0aae0 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... 

Merge "Scale stack dump timeout with HW_TIMEOUT_MULTIPLIER." am: cf89aac2 am: 3c3fcf68 am: 8ea2bd3c am: 02df88ff

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

Change-Id: Ica935ec382fd30ee63b1c7e1c5daf596fb4bf061
parents d2baa371 02df88ff

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

+1 −1
Original line number Diff line number Diff line
@@ -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