diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 30 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowTracing.java | 2 |
2 files changed, 22 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 899bf7c8fd39..1f116f8d5b85 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5736,6 +5736,11 @@ public class WindowManagerService extends IWindowManager.Stub mRoot.dumpTokens(pw, dumpAll); } + private void dumpTraceStatus(PrintWriter pw) { + pw.println("WINDOW MANAGER TRACE (dumpsys window trace)"); + pw.print(mWindowTracing.getStatus() + "\n"); + } + private void dumpSessionsLocked(PrintWriter pw, boolean dumpAll) { pw.println("WINDOW MANAGER SESSIONS (dumpsys window sessions)"); for (int i=0; i<mSessions.size(); i++) { @@ -6053,7 +6058,7 @@ public class WindowManagerService extends IWindowManager.Stub pw.println(" d[isplays]: active display contents"); pw.println(" t[okens]: token list"); pw.println(" w[indows]: window list"); - pw.println(" trace: write Winscope trace to file"); + pw.println(" trace: print trace status and write Winscope trace to file"); pw.println(" cmd may also be a NAME to dump windows. NAME may"); pw.println(" be a partial substring in a window name, a"); pw.println(" Window hex object identifier, or"); @@ -6128,6 +6133,7 @@ public class WindowManagerService extends IWindowManager.Stub } return; } else if ("trace".equals(cmd)) { + dumpTraceStatus(pw); synchronized (mGlobalLock) { mWindowTracing.writeTraceToFile(); } @@ -6144,43 +6150,49 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mGlobalLock) { pw.println(); + final String separator = "---------------------------------------------------------" + + "----------------------"; if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpLastANRLocked(pw); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpPolicyLocked(pw, args, dumpAll); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpAnimatorLocked(pw, args, dumpAll); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpSessionsLocked(pw, dumpAll); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } mRoot.dumpDisplayContents(pw); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpTokensLocked(pw, dumpAll); pw.println(); if (dumpAll) { - pw.println("-------------------------------------------------------------------------------"); + pw.println(separator); } dumpWindowsLocked(pw, dumpAll, null); + if (dumpAll) { + pw.println(separator); + } + dumpTraceStatus(pw); } } diff --git a/services/core/java/com/android/server/wm/WindowTracing.java b/services/core/java/com/android/server/wm/WindowTracing.java index 0ce215c88dad..3b17abc8732f 100644 --- a/services/core/java/com/android/server/wm/WindowTracing.java +++ b/services/core/java/com/android/server/wm/WindowTracing.java @@ -217,7 +217,7 @@ class WindowTracing { } } - private String getStatus() { + String getStatus() { return "Status: " + ((isEnabled()) ? "Enabled" : "Disabled") + "\n" |