Merge "Revert "Fix a bad merge"" into sc-v2-dev (1301c316) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -4945,12 +4945,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		* this has become invisible.
		*/
		private void postApplyAnimation(boolean visible) {
		final boolean usingShellTransitions =
		mAtmService.getTransitionController().getTransitionPlayer() != null;
		final boolean delayed = isAnimating(PARENTS \| CHILDREN,
		ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_WINDOW_ANIMATION
		\| ANIMATION_TYPE_RECENTS);
		if (!delayed && !usingShellTransitions) {
		if (!delayed) {
		// We aren't delayed anything, but exiting windows rely on the animation finished
		// callback being called in case the ActivityRecord was pretending to be delayed,
		// which we might have done because we were in closing/opening apps list.
		@@ -4969,8 +4967,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// updated.
		// If we're becoming invisible, update the client visibility if we are not running an
		// animation. Otherwise, we'll update client visibility in onAnimationFinished.
		if (visible \|\| !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS)
		\|\| usingShellTransitions) {
		if (visible \|\| !isAnimating(PARENTS,
		ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS)) {
		setClientVisible(visible);
		}