Merge "Prevent crash when manipulating hidden SurfaceView." (e3792518) · Commits · e / os / android_frameworks_base

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

+21 −15

Original line number	Diff line number	Diff line
		@@ -2534,12 +2534,15 @@ public class WindowManagerService extends IWindowManager.Stub
		win.mAttrs.height = bottom - top;
		win.setWindowScale(win.mRequestedWidth, win.mRequestedHeight);

		if (win.mHasSurface) {
		if (SHOW_TRANSACTIONS) {
		Slog.i(TAG_WM, ">>> OPEN TRANSACTION repositionChild");
		}

		SurfaceControl.openTransaction();

		try {

		win.applyGravityAndUpdateFrame();
		win.mWinAnimator.computeShownFrameLocked();

		@@ -2551,10 +2554,13 @@ public class WindowManagerService extends IWindowManager.Stub
		deferTransactionUntilFrame);
		}

		} finally {
		SurfaceControl.closeTransaction();
		if (SHOW_TRANSACTIONS) {
		Slog.i(TAG_WM, "<<< CLOSE TRANSACTION repositionChild");
		}
		}
		}

		outFrame = win.mCompatFrame;
		}