Merge "Merge "Defer remove splash screen window if it is inTransition." into... (05622723) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -2865,11 +2865,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return;
		}

		if (animate && mTransitionController.inCollectingTransition(startingWindow)
		&& startingWindow.cancelAndRedraw()) {
		if (animate && mTransitionController.inCollectingTransition(startingWindow)) {
		// Defer remove starting window after transition start.
		// If splash screen window was in collecting, the client side is unable to draw because
		// of Session#cancelDraw, which will blocking the remove animation.
		// The surface of app window could really show after the transition finish.
		startingWindow.mSyncTransaction.addTransactionCommittedListener(Runnable::run, () -> {
		synchronized (mAtmService.mGlobalLock) {
		surface.remove(true);