Merge "Don't meet tf condition if not added due to legacy sync" into main (5f7d1a56) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -569,7 +569,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
	// TODO(b/232042367) Redesign the organizer update on activity callback so that we		// TODO(b/232042367) Redesign the organizer update on activity callback so that we
	// we will know about the transition explicitly.		// we will know about the transition explicitly.
	final ActionChain chain = mService.mChainTracker.startTransit("tfTransact");		final ActionChain chain = mService.mChainTracker.startTransit("tfTransact");
	if (chain.getTransition() == null) {		final boolean legacySync = chain.getTransition() == null;
			if (legacySync) {
	// This should rarely happen, and we should try to avoid using		// This should rarely happen, and we should try to avoid using
	// {@link #applySyncTransaction} with Shell transition.		// {@link #applySyncTransaction} with Shell transition.
	// We still want to apply and merge the transaction to the active sync		// We still want to apply and merge the transaction to the active sync
	@@ -582,7 +583,9 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
	chain.getTransition().mReadyTracker.add(wctApplied);		chain.getTransition().mReadyTracker.add(wctApplied);
	}		}
	applyTransaction(wct, -1 /* syncId */, chain, caller);		applyTransaction(wct, -1 /* syncId */, chain, caller);
			if (!legacySync) {
	wctApplied.meet();		wctApplied.meet();
			}
	mService.mChainTracker.end();		mService.mChainTracker.end();
	return;		return;
	}		}