Merge "Remove enabled flag ensure_wallpaper_in_transitions" into main (95e2b929) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+0 −20

Original line number	Diff line number	Diff line
		@@ -297,26 +297,6 @@ flag {
		}
		}

		flag {
		name: "ensure_wallpaper_in_transitions"
		namespace: "windowing_frontend"
		description: "Ensure that wallpaper window tokens are always present/available for collection in transitions"
		bug: "347593088"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "ensure_wallpaper_in_wear_transitions"
		namespace: "windowing_frontend"
		description: "Ensure that wallpaper window tokens are always present/available for collection in transitions on Wear"
		bug: "355596979"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "ensure_keyguard_does_transition_starting"
		namespace: "windowing_frontend"

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import static android.window.TransitionInfo.FLAG_NO_ANIMATION;
		import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;

		import static com.android.systemui.shared.Flags.returnAnimationFrameworkLongLived;
		import static com.android.window.flags.Flags.ensureWallpaperInTransitions;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TRANSITIONS;
		import static com.android.wm.shell.shared.TransitionUtil.FLAG_IS_DESKTOP_WALLPAPER_ACTIVITY;
		import static com.android.wm.shell.shared.TransitionUtil.isClosingType;
		@@ -549,11 +548,6 @@ public class Transitions implements RemoteCallable<Transitions>,
		// transition animation.
		continue;
		}
		if (change.hasFlags(FLAG_IS_WALLPAPER) && !ensureWallpaperInTransitions()) {
		// Wallpaper is always z-ordered at bottom, and historically is not animated by
		// transition handlers.
		continue;
		}
		final SurfaceControl leash = change.getLeash();
		final int mode = info.getChanges().get(i).getMode();

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -5451,18 +5451,12 @@ final class ActivityRecord extends WindowToken {
		// drawn, they never will be, and we are sad.
		setClientVisible(true);

		if (!mWmService.mFlags.mEnsureWallpaperInTransitions) {
		requestUpdateWallpaperIfNeeded();
		}

		ProtoLog.v(WM_DEBUG_ADD_REMOVE, "No longer Stopped: %s", this);
		mAppStopped = false;

		transferStartingWindowFromHiddenAboveTokenIfNeeded();
		}
		if (mWmService.mFlags.mEnsureWallpaperInTransitions) {
		requestUpdateWallpaperIfNeeded();
		}

		// Defer committing visibility until transition starts.
		if (isCollecting) {

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

+3 −12

Original line number	Diff line number	Diff line
		@@ -1456,15 +1456,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// an activity, and wallpaper's visibility depends on activity's visibility.
		for (int i = mParticipants.size() - 1; i >= 0; --i) {
		final WindowContainer<?> wc = mParticipants.valueAt(i);
		WallpaperWindowToken wt = wc.asWallpaperToken();
		if (!Flags.ensureWallpaperInTransitions()) {
		if (wt == null) {
		final WindowState windowState = wc.asWindowState();
		if (windowState != null) {
		wt = windowState.mToken.asWallpaperToken();
		}
		}
		}
		final WallpaperWindowToken wt = wc.asWallpaperToken();
		if (wt == null \|\| !wt.isVisible()) continue;
		final WindowState target = wt.mDisplayContent.mWallpaperController.getWallpaperTarget();
		final boolean isTargetInvisible = target == null \|\| !target.mToken.isVisible();
		@@ -1899,8 +1891,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// If on a rotation leash, the wallpaper token surface needs to be shown explicitly
		// because shell only gets the leash and the wallpaper token surface is not allowed
		// to be changed by non-transition logic until the transition is finished.
		if (wp.mWmService.mFlags.mEnsureWallpaperInTransitions && wp.isVisibleRequested()
		&& wp.getFixedRotationLeash() != null) {
		if (wp.isVisibleRequested() && wp.getFixedRotationLeash() != null) {
		transaction.show(wp.mSurfaceControl);
		}
		continue;
		@@ -3040,7 +3031,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// Use parent rotation because shell doesn't know the surface is rotated.
		endRotation = parent.getWindowConfiguration().getRotation();
		}
		} else if (isWallpaper(target) && target.mWmService.mFlags.mEnsureWallpaperInTransitions
		} else if (isWallpaper(target)
		&& target.getRelativeDisplayRotation() != 0
		&& !target.mTransitionController.useShellTransitionsRotation()) {
		// If the wallpaper is "fixed-rotated", shell is unaware of this, so use the

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

+4 −14

Original line number	Diff line number	Diff line
		@@ -736,19 +736,11 @@ class WallpaperController {

		void collectTopWallpapers(Transition transition) {
		if (mFindResults.hasTopShowWhenLockedWallpaper()) {
		if (mService.mFlags.mEnsureWallpaperInTransitions) {
		transition.collect(mFindResults.mTopWallpaper.mTopShowWhenLockedWallpaper.mToken);
		} else {
		transition.collect(mFindResults.mTopWallpaper.mTopShowWhenLockedWallpaper);
		}

		}
		if (mFindResults.hasTopHideWhenLockedWallpaper()) {
		if (mService.mFlags.mEnsureWallpaperInTransitions) {
		transition.collect(mFindResults.mTopWallpaper.mTopHideWhenLockedWallpaper.mToken);
		} else {
		transition.collect(mFindResults.mTopWallpaper.mTopHideWhenLockedWallpaper);
		}
		}
		}

		@@ -874,10 +866,8 @@ class WallpaperController {
		}
		}

		boolean visibleRequested = visible;
		if (mDisplayContent.mWmService.mFlags.mEnsureWallpaperInTransitions) {
		visibleRequested = mWallpaperTarget != null && mWallpaperTarget.isVisibleRequested();
		}
		final boolean visibleRequested =
		mWallpaperTarget != null && mWallpaperTarget.isVisibleRequested();
		updateWallpaperTokens(visibleRequested,
		mService.mFlags.mAodTransition
		? mDisplayContent.isKeyguardLockedOrAodShowing()