Merge "Improve window manager debug output." (6ae7ba32) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -1336,8 +1336,10 @@ public interface WindowManager extends ViewManager {
		sb.append(type);
		sb.append(" fl=#");
		sb.append(Integer.toHexString(flags));
		if (format != PixelFormat.OPAQUE) {
		sb.append(" fmt=");
		sb.append(format);
		}
		if (windowAnimations != 0) {
		sb.append(" wanim=0x");
		sb.append(Integer.toHexString(windowAnimations));
		@@ -1373,7 +1375,9 @@ public interface WindowManager extends ViewManager {
		sb.append(" sysuil=");
		sb.append(hasSystemUiListeners);
		}
		if (inputFeatures != 0) {
		sb.append(" if=0x").append(Integer.toHexString(inputFeatures));
		}
		sb.append('}');
		return sb.toString();
		}

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

+394 −163

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/wm/WindowState.java

+69 −55

Original line number	Diff line number	Diff line
		@@ -1511,10 +1511,13 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		}
		}

		void dump(PrintWriter pw, String prefix) {
		void dump(PrintWriter pw, String prefix, boolean dumpAll) {
		pw.print(prefix); pw.print("mSession="); pw.print(mSession);
		pw.print(" mClient="); pw.println(mClient.asBinder());
		pw.print(prefix); pw.print("mAttrs="); pw.println(mAttrs);
		pw.print(prefix); pw.print("Requested w="); pw.print(mRequestedWidth);
		pw.print(" h="); pw.print(mRequestedHeight);
		pw.print(" mLayoutSeq="); pw.println(mLayoutSeq);
		if (mAttachedWindow != null \|\| mLayoutAttached) {
		pw.print(prefix); pw.print("mAttachedWindow="); pw.print(mAttachedWindow);
		pw.print(" mLayoutAttached="); pw.println(mLayoutAttached);
		@@ -1525,6 +1528,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(" mIsFloatingLayer="); pw.print(mIsFloatingLayer);
		pw.print(" mWallpaperVisible="); pw.println(mWallpaperVisible);
		}
		if (dumpAll) {
		pw.print(prefix); pw.print("mBaseLayer="); pw.print(mBaseLayer);
		pw.print(" mSubLayer="); pw.print(mSubLayer);
		pw.print(" mAnimLayer="); pw.print(mLayer); pw.print("+");
		@@ -1532,8 +1536,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		: (mAppToken != null ? mAppToken.animLayerAdjustment : 0)));
		pw.print("="); pw.print(mAnimLayer);
		pw.print(" mLastLayer="); pw.println(mLastLayer);
		}
		if (mSurface != null) {
		if (dumpAll) {
		pw.print(prefix); pw.print("mSurface="); pw.println(mSurface);
		}
		pw.print(prefix); pw.print("Surface: shown="); pw.print(mSurfaceShown);
		pw.print(" layer="); pw.print(mSurfaceLayer);
		pw.print(" alpha="); pw.print(mSurfaceAlpha);
		@@ -1542,6 +1549,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(") "); pw.print(mSurfaceW);
		pw.print(" x "); pw.println(mSurfaceH);
		}
		if (dumpAll) {
		pw.print(prefix); pw.print("mToken="); pw.println(mToken);
		pw.print(prefix); pw.print("mRootToken="); pw.println(mRootToken);
		if (mAppToken != null) {
		@@ -1555,6 +1563,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(" mLastHidden="); pw.print(mLastHidden);
		pw.print(" mHaveFrame="); pw.print(mHaveFrame);
		pw.print(" mObscured="); pw.println(mObscured);
		}
		if (!mPolicyVisibility \|\| !mPolicyVisibilityAfterAnim \|\| mAttachedHidden) {
		pw.print(prefix); pw.print("mPolicyVisibility=");
		pw.print(mPolicyVisibility);
		@@ -1565,13 +1574,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		if (!mRelayoutCalled) {
		pw.print(prefix); pw.print("mRelayoutCalled="); pw.println(mRelayoutCalled);
		}
		pw.print(prefix); pw.print("Requested w="); pw.print(mRequestedWidth);
		pw.print(" h="); pw.print(mRequestedHeight);
		pw.print(" mLayoutSeq="); pw.println(mLayoutSeq);
		if (mXOffset != 0 \|\| mYOffset != 0) {
		pw.print(prefix); pw.print("Offsets x="); pw.print(mXOffset);
		pw.print(" y="); pw.println(mYOffset);
		}
		if (dumpAll) {
		pw.print(prefix); pw.print("mGivenContentInsets=");
		mGivenContentInsets.printShortString(pw);
		pw.print(" mGivenVisibleInsets=");
		@@ -1582,15 +1589,19 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(" mGivenInsetsPending="); pw.println(mGivenInsetsPending);
		}
		pw.print(prefix); pw.print("mConfiguration="); pw.println(mConfiguration);
		}
		pw.print(prefix); pw.print("mShownFrame=");
		mShownFrame.printShortString(pw); pw.println();
		if (dumpAll) {
		pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw);
		pw.print(" last="); mLastFrame.printShortString(pw);
		pw.println();
		}
		if (mEnforceSizeCompat) {
		pw.print(prefix); pw.print("mCompatFrame="); mCompatFrame.printShortString(pw);
		pw.println();
		}
		if (dumpAll) {
		pw.print(prefix); pw.print("mContainingFrame=");
		mContainingFrame.printShortString(pw);
		pw.print(" mParentFrame=");
		@@ -1606,6 +1617,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(" mVisibleInsets="); mVisibleInsets.printShortString(pw);
		pw.print(" last="); mLastVisibleInsets.printShortString(pw);
		pw.println();
		}
		if (mAnimating \|\| mLocalAnimating \|\| mAnimationIsEntrance
		\|\| mAnimation != null) {
		pw.print(prefix); pw.print("mAnimating="); pw.print(mAnimating);
		@@ -1632,10 +1644,12 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		pw.print(" mDsDy="); pw.print(mDsDy);
		pw.print(" mDtDy="); pw.println(mDtDy);
		}
		if (dumpAll) {
		pw.print(prefix); pw.print("mDrawPending="); pw.print(mDrawPending);
		pw.print(" mCommitDrawPending="); pw.print(mCommitDrawPending);
		pw.print(" mReadyToShow="); pw.print(mReadyToShow);
		pw.print(" mHasDrawn="); pw.println(mHasDrawn);
		}
		if (mExiting \|\| mRemoveOnExit \|\| mDestroying \|\| mRemoved) {
		pw.print(prefix); pw.print("mExiting="); pw.print(mExiting);
		pw.print(" mRemoveOnExit="); pw.print(mRemoveOnExit);