Merge "Lock down window manager while changing opacity" into lmp-dev (b3fdbac0) · Commits · e / os / android_frameworks_base

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -4304,20 +4304,28 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		public void setAppFullscreen(IBinder token, boolean toOpaque) {
		synchronized (mWindowMap) {
		AppWindowToken atoken = findAppWindowToken(token);
		if (atoken != null) {
		atoken.appFullscreen = toOpaque;
		setWindowOpaque(token, toOpaque);
		requestTraversal();
		setWindowOpaqueLocked(token, toOpaque);
		requestTraversalLocked();
		}
		}
		}

		public void setWindowOpaque(IBinder token, boolean isOpaque) {
		synchronized (mWindowMap) {
		setWindowOpaqueLocked(token, isOpaque);
		}
		}

		public void setWindowOpaqueLocked(IBinder token, boolean isOpaque) {
		AppWindowToken wtoken = findAppWindowToken(token);
		if (wtoken != null) {
		WindowState win = wtoken.findMainWindow();
		if (win != null) {
		win.mWinAnimator.setOpaque(isOpaque);
		win.mWinAnimator.setOpaqueLocked(isOpaque);
		}
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -1556,11 +1556,11 @@ class WindowStateAnimator {
		}
		}

		void setOpaque(boolean isOpaque) {
		void setOpaqueLocked(boolean isOpaque) {
		if (mSurfaceControl == null) {
		return;
		}
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, ">>> OPEN TRANSACTION setOpaque");
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, ">>> OPEN TRANSACTION setOpaqueLocked");
		SurfaceControl.openTransaction();
		try {
		if (SHOW_TRANSACTIONS) WindowManagerService.logSurface(mWin, "isOpaque=" + isOpaque,
		@@ -1568,7 +1568,7 @@ class WindowStateAnimator {
		mSurfaceControl.setOpaque(isOpaque);
		} finally {
		SurfaceControl.closeTransaction();
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, "<<< CLOSE TRANSACTION setOpaque");
		if (SHOW_LIGHT_TRANSACTIONS) Slog.i(TAG, "<<< CLOSE TRANSACTION setOpaqueLocked");
		}
		}