Merge "Revert "Clear transitions for app windows display change."" into qt-dev (61ae2986) · Commits · e / os / android_frameworks_base

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -1331,9 +1331,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		if (prevDc == null \|\| prevDc == mDisplayContent) {
		return;
		}

		prevDc.mOpeningApps.remove(this);
		if (prevDc.mChangingApps.remove(this)) {
		if (prevDc.mChangingApps.contains(this)) {
		// This gets called after the AppWindowToken has been reparented to the new display.
		// That reparenting resulted in this window changing modes (eg. FREEFORM -> FULLSCREEN),
		// so this token is now "frozen" while waiting for the animation to start on prevDc
		@@ -1342,8 +1340,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		// so we need to cancel the change transition here.
		clearChangeLeash(getPendingTransaction(), true /* cancel */);
		}
		prevDc.mClosingApps.remove(this);

		if (prevDc.mFocusedApp == this) {
		prevDc.setFocusedApp(null);
		final TaskStack stack = dc.getTopStack();
		@@ -3229,6 +3225,16 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		true /* topToBottom */);
		}

		void removeFromPendingTransition() {
		if (isWaitingForTransitionStart() && mDisplayContent != null) {
		mDisplayContent.mOpeningApps.remove(this);
		if (mDisplayContent.mChangingApps.remove(this)) {
		clearChangeLeash(getPendingTransaction(), true /* cancel */);
		}
		mDisplayContent.mClosingApps.remove(this);
		}
		}

		private void updateColorTransform() {
		if (mSurfaceControl != null && mLastAppSaturationInfo != null) {
		getPendingTransaction().setColorTransform(mSurfaceControl,

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -2377,6 +2377,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		+ " to its current displayId=" + mDisplayId);
		}

		// Clean up all pending transitions when stack reparent to another display.
		stack.forAllAppWindows(AppWindowToken::removeFromPendingTransition);

		prevDc.mTaskStackContainers.removeChild(stack);
		mTaskStackContainers.addStackToDisplay(stack, onTop);
		}