Merge "Ignore transition if not collecting" into main (e088221c) · Commits · e / os / android_frameworks_base

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -612,10 +612,16 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		mService.mTaskSupervisor.beginDeferResume();
		boolean deferResume = true;
		mService.mTaskSupervisor.setDeferRootVisibilityUpdate(true /* deferUpdate */);
		final boolean shouldDeferTransitionReady = transition != null && !t.isEmpty()
		&& (transition.isCollecting() \|\| Flags.alwaysDeferTransitionWhenApplyWct());
		if (shouldDeferTransitionReady) {
		boolean deferTransitionReady = false;
		if (transition != null && !t.isEmpty()) {
		if (transition.isCollecting()) {
		deferTransitionReady = true;
		transition.deferTransitionReady();
		} else if (Flags.alwaysDeferTransitionWhenApplyWct()) {
		Slog.w(TAG, "Transition is not collecting when applyTransaction."
		+ " transition=" + transition + " state=" + transition.getState());
		transition = null;
		}
		}
		try {
		final ArraySet<WindowContainer<?>> haveConfigChanges = new ArraySet<>();
		@@ -771,7 +777,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
		mService.mWindowManager.mWindowPlacerLocked.requestTraversal();
		}
		} finally {
		if (shouldDeferTransitionReady) {
		if (deferTransitionReady) {
		transition.continueTransitionReady();
		}
		mService.mTaskSupervisor.setDeferRootVisibilityUpdate(false /* deferUpdate */);