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

Commit ee2c7c7d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Wrap logcat invocations with timeout." into nyc-dev

parents e11eb10e fe523c67

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

+5 −4
Original line number Diff line number Diff line
@@ -13227,10 +13227,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    // Merge several logcat streams, and take the last N lines

                    InputStreamReader input = null;

                    try {

                        java.lang.Process logcat = new ProcessBuilder("/system/bin/logcat",

                                "-v", "time", "-b", "events", "-b", "system", "-b", "main",

                                "-b", "crash",

                                "-t", String.valueOf(lines)).redirectErrorStream(true).start();

                        java.lang.Process logcat = new ProcessBuilder(

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

                                "/system/bin/logcat", "-v", "time", "-b", "events", "-b", "system",

                                "-b", "main", "-b", "crash", "-t", String.valueOf(lines))

                                        .redirectErrorStream(true).start();















                        try { logcat.getOutputStream().close(); } catch (IOException e) {}















                        try { logcat.getErrorStream().close(); } catch (IOException e) {}