Merge "WM: Guard against released surfaces in forced rotator" into pi-dev (9352e362) · Commits · e / os / android_frameworks_base

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ public class ForcedSeamlessRotator {
		public void finish(WindowToken token, WindowState win) {
		mTransform.reset();
		token.getPendingTransaction().setMatrix(token.mSurfaceControl, mTransform, mFloat9);
		if (win.mWinAnimator.mSurfaceController != null) {
		token.getPendingTransaction().deferTransactionUntil(token.mSurfaceControl,
		win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
		win.getFrameNumber());
		@@ -82,6 +83,7 @@ public class ForcedSeamlessRotator {
		win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
		win.getFrameNumber());
		}
		}

		public void dump(PrintWriter pw) {
		pw.print("{old="); pw.print(mOldRotation); pw.print(", new="); pw.print(mNewRotation);