Merge "Only set display ready when transfering displays" into tm-qpr-dev (2d71a01c) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3773,9 +3773,9 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		// Check if this is changing displays. If so, mark the old display as "ready" for
		// transitions. This is to work around the problem where setting readiness against this
		// container will only set the new display as ready and leave the old display as unready.
		if (mSyncState != SYNC_STATE_NONE && oldParent != null
		&& oldParent.getDisplayContent() != null && (newParent == null
		\|\| oldParent.getDisplayContent() != newParent.getDisplayContent())) {
		if (mSyncState != SYNC_STATE_NONE && oldParent != null && newParent != null
		&& oldParent.getDisplayContent() != null && newParent.getDisplayContent() != null
		&& oldParent.getDisplayContent() != newParent.getDisplayContent()) {
		mTransitionController.setReady(oldParent.getDisplayContent());
		}