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

Commit 29ee1b8f authored by Todd Lee's avatar Todd Lee Committed by Cherrypicker Worker
Browse files

Ensure that we always have a useable wallpaper token for animation 

Bug: b/347593088
Test: presubmits
Flag: NONE minor refactor
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6d6cab2e9a0b923ad4c54a7b77e41d45fc8d9804)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0ea8d6f2b5c54bdcf3aebeb0aa70bd3e10f05169)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9dea1fabbe98913024786baf878df64c2e572168)
Merged-In: Ia971daa962beab3fd4c93215b480280a9384b380
Change-Id: Ia971daa962beab3fd4c93215b480280a9384b380
parent eeb90eea

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

+2 −3
Original line number Diff line number Diff line
@@ -2444,9 +2444,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
@@ -753,10 +753,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);

        }

    }