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

Commit 69d2ed20 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-mr1-dev am:... 

Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-mr1-dev am: a8cf435e am: 009853b0
am: 2705e650

Change-Id: I7e08a4371478b12566b6ac8cc6467fb0bc553698
parents b34fbe72 2705e650

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

+1 −1
Original line number Diff line number Diff line
@@ -13811,7 +13811,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    try {

                        java.lang.Process logcat = new ProcessBuilder(

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

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

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

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

                                        .redirectErrorStream(true).start();