Merge "use threadtime when collecting logcat" into nyc-mr1-dev

2016-08-24 23:11:02 +00:00
parent a8cf435e81 d8ac1dd3ed
commit 333680114d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13820,7 +13820,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();