Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Elliott Hughes
2022-08-09 21:57:01 +00:00
committed by Gerrit Code Review
parent 525e043906 8432d4a6ab
commit 6c62108411
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -8407,9 +8407,9 @@ public class ActivityManagerService extends IActivityManager.Stub
InputStreamReader input = null; InputStreamReader input = null;
try { try {
java.lang.Process logcat = new ProcessBuilder( 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. // 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. // Merge several logcat streams, and take the last N lines.
"/system/bin/logcat", "-v", "threadtime", "-b", "events", "-b", "system", "/system/bin/logcat", "-v", "threadtime", "-b", "events", "-b", "system",
"-b", "main", "-b", "crash", "-t", String.valueOf(lines)) "-b", "main", "-b", "crash", "-t", String.valueOf(lines))