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

Commit 353c4683 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Use `timeout -i` to distinguish cases where logcat is making... 

Merge "Merge "Use `timeout -i` to distinguish cases where logcat is making progress." am: 6c621084 am: b67d6e52 am: 540cc694 am: c76ee30f" into tm-qpr-dev-plus-aosp am: 4b98ed57

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



Change-Id: Ib638d308fcc2253202a0a7c4b705edccfc69becf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c7fff3c 4b98ed57

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

+2 −2
Original line number Diff line number Diff line
@@ -8894,9 +8894,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    InputStreamReader input = null;

                    try {

                        java.lang.Process logcat = new ProcessBuilder(

                                // Time out after 10s, but kill logcat with SEGV

                                // Time out after 10s of inactivity, but kill logcat with SEGV

                                // so we can investigate why it didn't finish.

                                "/system/bin/timeout", "-s", "SEGV", "10s",

                                "/system/bin/timeout", "-i", "-s", "SEGV", "10s",

                                // Merge several logcat streams, and take the last N lines.

                                "/system/bin/logcat", "-v", "threadtime", "-b", "events", "-b", "system",

                                "-b", "main", "-b", "crash", "-t", String.valueOf(lines))