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

Merge "Merge "Use timeout -i to distinguish cases where logcat is making progress." am: 6c62108411 am: b67d6e5221 am: 540cc694ba am: c76ee30f86" into tm-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-08-10 00:21:49 +00:00
committed by Android (Google) Code Review
parent dcb17446f6 963c4e7e43
commit 4b98ed5757
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

@@ -8883,9 +8883,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))