Merge "Prevent setting position to a surface attached to leash" into tm-qpr-dev (eecdde18) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -809,7 +809,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		};

		private final Consumer<SurfaceControl.Transaction> mSetSurfacePositionConsumer = t -> {
		if (mSurfaceControl != null && mSurfaceControl.isValid()) {
		// Only apply the position to the surface when there's no leash created.
		if (mSurfaceControl != null && mSurfaceControl.isValid() && !mSurfaceAnimator.hasLeash()) {
		t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);
		}
		};