Merge "Call WindowContainer#dump in all levels" into rvc-dev (a7642cd3) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7540,7 +7540,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	public String toString() {		public String toString() {
	if (stringName != null) {		if (stringName != null) {
	return stringName + " t" + (task == null ? INVALID_TASK_ID : task.mTaskId) +		return stringName + " t" + (task == null ? INVALID_TASK_ID : task.mTaskId) +
	(finishing ? " f}" : "") + (mIsExiting ? " mIsExiting=" : "") + "}";		(finishing ? " f}" : "") + (mIsExiting ? " isExiting" : "") + "}";
	}		}
	StringBuilder sb = new StringBuilder(128);		StringBuilder sb = new StringBuilder(128);
	sb.append("ActivityRecord{");		sb.append("ActivityRecord{");

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3232,22 +3232,22 @@ class ActivityStack extends Task {

	@Override		@Override
	void dump(PrintWriter pw, String prefix, boolean dumpAll) {		void dump(PrintWriter pw, String prefix, boolean dumpAll) {
	pw.println(prefix + "mStackId=" + getRootTaskId());		if (mDeferRemoval) {
	pw.println(prefix + "mDeferRemoval=" + mDeferRemoval);		pw.println(prefix + "mDeferRemoval=true");
	pw.println(prefix + "mBounds=" + getRawBounds().toShortString());
	for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
	mChildren.get(taskNdx).dump(pw, prefix + " ", dumpAll);
	}		}
			super.dump(pw, prefix, dumpAll);
	if (!mExitingActivities.isEmpty()) {		if (!mExitingActivities.isEmpty()) {
	pw.println();		pw.println();
	pw.println(" Exiting application tokens:");		pw.println(prefix + "Exiting application tokens:");
			final String doublePrefix = prefix + " ";
	for (int i = mExitingActivities.size() - 1; i >= 0; i--) {		for (int i = mExitingActivities.size() - 1; i >= 0; i--) {
	WindowToken token = mExitingActivities.get(i);		WindowToken token = mExitingActivities.get(i);
	pw.print(" Exiting App #"); pw.print(i);		pw.print(doublePrefix + "Exiting App #" + i);
	pw.print(' '); pw.print(token);		pw.print(' '); pw.print(token);
	pw.println(':');		pw.println(':');
	token.dump(pw, " ", dumpAll);		token.dump(pw, doublePrefix, dumpAll);
	}		}
			pw.println();
	}		}
	mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix);		mAnimatingActivityRegistry.dump(pw, "AnimatingApps:", prefix);
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1886,7 +1886,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
	public void dump(PrintWriter pw, String prefix) {		public void dump(PrintWriter pw, String prefix) {
	pw.println();		pw.println();
	pw.println("ActivityStackSupervisor state:");		pw.println("ActivityStackSupervisor state:");
	mRootWindowContainer.dump(pw, prefix);		mRootWindowContainer.dump(pw, prefix, true /* dumpAll */);
	getKeyguardController().dump(pw, prefix);		getKeyguardController().dump(pw, prefix);
	mService.getLockTaskController().dump(pw, prefix);		mService.getLockTaskController().dump(pw, prefix);
	pw.print(prefix);		pw.print(prefix);

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2977,12 +2977,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
	pw.println();		pw.println();
	mWallpaperController.dump(pw, " ");		mWallpaperController.dump(pw, " ");

			if (mSystemGestureExclusionListeners.getRegisteredCallbackCount() > 0) {
	pw.println();		pw.println();
	pw.print(" mSystemGestureExclusion=");		pw.print(" mSystemGestureExclusion=");
	if (mSystemGestureExclusionListeners.getRegisteredCallbackCount() > 0) {
	pw.println(mSystemGestureExclusion);		pw.println(mSystemGestureExclusion);
	} else {
	pw.println("<no lstnrs>");
	}		}

	pw.println();		pw.println();

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3570,12 +3570,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
	}		}
	}		}

	public void dump(PrintWriter pw, String prefix) {		@Override
			public void dump(PrintWriter pw, String prefix, boolean dumpAll) {
			super.dump(pw, prefix, dumpAll);
	pw.print(prefix);		pw.print(prefix);
	pw.println("topDisplayFocusedStack=" + getTopDisplayFocusedStack());		pw.println("topDisplayFocusedStack=" + getTopDisplayFocusedStack());
	for (int i = getChildCount() - 1; i >= 0; --i) {		for (int i = getChildCount() - 1; i >= 0; --i) {
	final DisplayContent display = getChildAt(i);		final DisplayContent display = getChildAt(i);
	display.dump(pw, prefix, true /* dumpAll */);		display.dump(pw, prefix, dumpAll);
	}		}
	pw.println();		pw.println();
	}		}