Merge "Only ignore transition change of finishing transient launch" into main (e182d867) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -5550,9 +5550,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (!visible) {
		if (mTransitionController.inPlayingTransition(this)) {
		mTransitionChangeFlags \|= FLAG_IS_OCCLUDED;
		} else if (mTransitionController.inFinishingTransition(this)) {
		if (mTransitionController.mFinishingTransition != null
		&& mTransitionController.mFinishingTransition.isTransientLaunch(this)) {
		mTransitionChangeFlags \|= FLAGS_IS_OCCLUDED_NO_ANIMATION;
		}
		}
		} else {
		mTransitionChangeFlags &= ~FLAG_IS_OCCLUDED;
		}