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

Commit 748b51d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure that we always have a useable wallpaper token for animation" into main

parents f6ec228d 6d6cab2e

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

+2 −3
Original line number Diff line number Diff line
@@ -2544,9 +2544,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            if (wc.asWindowState() != null) continue;



            final ChangeInfo changeInfo = changes.get(wc);



            // Reject no-ops

            if (!changeInfo.hasChanged()) {

            // Reject no-ops, unless wallpaper

            if (!changeInfo.hasChanged() && wc.asWallpaperToken() == null) {

                ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS,

                        "  Rejecting as no-op: %s", wc);

                continue;

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

+2 −2
Original line number Diff line number Diff line
@@ -764,10 +764,10 @@ class WallpaperController { 


    void collectTopWallpapers(Transition transition) {

        if (mFindResults.hasTopShowWhenLockedWallpaper()) {

            transition.collect(mFindResults.mTopWallpaper.mTopShowWhenLockedWallpaper);

            transition.collect(mFindResults.mTopWallpaper.mTopShowWhenLockedWallpaper.mToken);

        }

        if (mFindResults.hasTopHideWhenLockedWallpaper()) {

            transition.collect(mFindResults.mTopWallpaper.mTopHideWhenLockedWallpaper);

            transition.collect(mFindResults.mTopWallpaper.mTopHideWhenLockedWallpaper.mToken);

        }

    }