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." am: 6c62108411 am: b67d6e5221

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

Change-Id: I449427a51fd72714abdfcc2ee6eb09def030eb0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes
2022-08-09 23:05:48 +00:00
committed by Automerger Merge Worker
parent 58eddceacd b67d6e5221
commit 540cc694ba
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

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