am 20fda53d: am 9f547d09: am c8baca41: am ae1e4824: am cfcaa31f: Merge "Work... (6aa2f3b2) · Commits · e / os / android_frameworks_base

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

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11190,6 +11190,7 @@ public class WindowManagerService extends IWindowManager.Stub
	pw.println(" p[policy]: policy state");		pw.println(" p[policy]: policy state");
	pw.println(" a[animator]: animator state");		pw.println(" a[animator]: animator state");
	pw.println(" s[essions]: active sessions");		pw.println(" s[essions]: active sessions");
			pw.println(" surfaces: active surfaces (debugging enabled only)");
	pw.println(" d[isplays]: active display contents");		pw.println(" d[isplays]: active display contents");
	pw.println(" t[okens]: token list");		pw.println(" t[okens]: token list");
	pw.println(" w[indows]: window list");		pw.println(" w[indows]: window list");
	@@ -11229,6 +11230,11 @@ public class WindowManagerService extends IWindowManager.Stub
	dumpSessionsLocked(pw, true);		dumpSessionsLocked(pw, true);
	}		}
	return;		return;
			} else if ("surfaces".equals(cmd)) {
			synchronized(mWindowMap) {
			WindowStateAnimator.SurfaceTrace.dumpAllSurfaces(pw, null);
			}
			return;
	} else if ("displays".equals(cmd) \|\| "d".equals(cmd)) {		} else if ("displays".equals(cmd) \|\| "d".equals(cmd)) {
	synchronized(mWindowMap) {		synchronized(mWindowMap) {
	dumpDisplayContentsLocked(pw, true);		dumpDisplayContentsLocked(pw, true);
	@@ -11284,6 +11290,13 @@ public class WindowManagerService extends IWindowManager.Stub
	if (dumpAll) {		if (dumpAll) {
	pw.println("-------------------------------------------------------------------------------");		pw.println("-------------------------------------------------------------------------------");
	}		}
			WindowStateAnimator.SurfaceTrace.dumpAllSurfaces(pw, dumpAll ?
			"-------------------------------------------------------------------------------"
			: null);
			pw.println();
			if (dumpAll) {
			pw.println("-------------------------------------------------------------------------------");
			}
	dumpDisplayContentsLocked(pw, dumpAll);		dumpDisplayContentsLocked(pw, dumpAll);
	pw.println();		pw.println();
	if (dumpAll) {		if (dumpAll) {

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

+47 −13

Original line number	Original line	Diff line number	Diff line
	@@ -536,6 +536,9 @@ class WindowStateAnimator {
	mSize.set(w, h);		mSize.set(w, h);
	Slog.v(SURFACE_TAG, "ctor: " + this + ". Called by "		Slog.v(SURFACE_TAG, "ctor: " + this + ". Called by "
	+ Debug.getCallers(3));		+ Debug.getCallers(3));
			synchronized (sSurfaces) {
			sSurfaces.add(0, this);
			}
	}		}

	@Override		@Override
	@@ -557,6 +560,7 @@ class WindowStateAnimator {
	}		}
	super.setLayer(zorder);		super.setLayer(zorder);

			synchronized (sSurfaces) {
	sSurfaces.remove(this);		sSurfaces.remove(this);
	int i;		int i;
	for (i = sSurfaces.size() - 1; i >= 0; i--) {		for (i = sSurfaces.size() - 1; i >= 0; i--) {
	@@ -567,6 +571,7 @@ class WindowStateAnimator {
	}		}
	sSurfaces.add(i + 1, this);		sSurfaces.add(i + 1, this);
	}		}
			}

	@Override		@Override
	public void setPosition(float x, float y) {		public void setPosition(float x, float y) {
	@@ -655,21 +660,50 @@ class WindowStateAnimator {
	public void destroy() {		public void destroy() {
	super.destroy();		super.destroy();
	Slog.v(SURFACE_TAG, "destroy: " + this + ". Called by " + Debug.getCallers(3));		Slog.v(SURFACE_TAG, "destroy: " + this + ". Called by " + Debug.getCallers(3));
			synchronized (sSurfaces) {
	sSurfaces.remove(this);		sSurfaces.remove(this);
	}		}
			}

	@Override		@Override
	public void release() {		public void release() {
	super.release();		super.release();
	Slog.v(SURFACE_TAG, "release: " + this + ". Called by "		Slog.v(SURFACE_TAG, "release: " + this + ". Called by "
	+ Debug.getCallers(3));		+ Debug.getCallers(3));
			synchronized (sSurfaces) {
	sSurfaces.remove(this);		sSurfaces.remove(this);
	}		}
			}

	static void dumpAllSurfaces() {		static void dumpAllSurfaces(PrintWriter pw, String header) {
			synchronized (sSurfaces) {
	final int N = sSurfaces.size();		final int N = sSurfaces.size();
			if (N <= 0) {
			return;
			}
			if (header != null) {
			pw.println(header);
			}
			pw.println("WINDOW MANAGER SURFACES (dumpsys window surfaces)");
	for (int i = 0; i < N; i++) {		for (int i = 0; i < N; i++) {
	Slog.i(TAG, "SurfaceDump: " + sSurfaces.get(i));		SurfaceTrace s = sSurfaces.get(i);
			pw.print(" Surface #"); pw.print(i); pw.print(": #");
			pw.print(Integer.toHexString(System.identityHashCode(s)));
			pw.print(" "); pw.println(s.mName);
			pw.print(" mLayerStack="); pw.print(s.mLayerStack);
			pw.print(" mLayer="); pw.println(s.mLayer);
			pw.print(" mShown="); pw.print(s.mShown); pw.print(" mAlpha=");
			pw.print(s.mSurfaceTraceAlpha); pw.print(" mIsOpaque=");
			pw.println(s.mIsOpaque);
			pw.print(" mPosition="); pw.print(s.mPosition.x); pw.print(",");
			pw.print(s.mPosition.y);
			pw.print(" mSize="); pw.print(s.mSize.x); pw.print("x");
			pw.println(s.mSize.y);
			pw.print(" mCrop="); s.mWindowCrop.printShortString(pw); pw.println();
			pw.print(" Transform: ("); pw.print(s.mDsdx); pw.print(", ");
			pw.print(s.mDtdx); pw.print(", "); pw.print(s.mDsdy);
			pw.print(", "); pw.print(s.mDtdy); pw.println(")");
			}
	}		}
	}		}