Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd5e0d91 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Respect visible-requested of wallpaper token" into main

parents ac0bd013 a28a2fce

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

+1 −2
Original line number Diff line number Diff line
@@ -2185,8 +2185,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            final WallpaperWindowToken wallpaper = mParticipants.valueAt(i).asWallpaperToken();

            if (wallpaper != null) {

                if (!wallpaper.isVisible() && (wallpaper.isVisibleRequested()

                        || (Flags.ensureWallpaperInTransitions() && showWallpaper))) {

                if (!wallpaper.isVisible() && wallpaper.isVisibleRequested()) {

                    wallpaper.commitVisibility(showWallpaper);

                } else if (Flags.ensureWallpaperInTransitions() && wallpaper.isVisible()

                        && !showWallpaper && !wallpaper.getDisplayContent().isKeyguardLocked()