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

Commit 452973d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Kill logcat with SEGV so we get a tombstone on timeout." am: 2a088541 am: e7c63d9e 

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

Change-Id: Ie1d351c321bef60a80146175ced784fe96b99cfd
parents 1d9fcc77 e7c63d9e

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

+4 −2
Original line number Diff line number Diff line
@@ -8232,11 +8232,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                if (lines > 0) {

                    sb.append("\n");













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















                    InputStreamReader input = null;















                    try {















                        java.lang.Process logcat = new ProcessBuilder(













                                "/system/bin/timeout", "-k", "15s", "10s",













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













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













                                "/system/bin/timeout", "-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))















                                        .redirectErrorStream(true).start();