Merge "Use `timeout -i` to distinguish cases where logcat is making progress."
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 09b601c..8ca6889 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8407,9 +8407,9 @@
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))