Merge "Add window trace status to the bug report" (bc2eea9a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+21 −9

Original line number	Diff line number	Diff line
		@@ -5760,6 +5760,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++) {
		@@ -6077,7 +6082,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");
		@@ -6152,6 +6157,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		return;
		} else if ("trace".equals(cmd)) {
		dumpTraceStatus(pw);
		synchronized (mGlobalLock) {
		mWindowTracing.writeTraceToFile();
		}
		@@ -6168,43 +6174,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);
		}
		}

services/core/java/com/android/server/wm/WindowTracing.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ class WindowTracing {
		}
		}

		private String getStatus() {
		String getStatus() {
		return "Status: "
		+ ((isEnabled()) ? "Enabled" : "Disabled")
		+ "\n"