Merge "Don't set client visibility to false while resumed" into udc-qpr-dev (63153a29) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -5651,9 +5651,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// to be some edge cases where we change our visibility but client visibility never gets
		// 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 \|\| usingShellTransitions
		\|\| !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS)) {
		// animation and aren't in RESUMED state. Otherwise, we'll update client visibility in
		// onAnimationFinished or activityStopped.
		if (visible \|\| (mState != RESUMED && (usingShellTransitions \|\| !isAnimating(
		PARENTS, ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS)))) {
		setClientVisible(visible);
		}