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

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

Merge "Remove unnecessary wallpaper adjustment on transition"

parents 9e764816 46332a8e

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

+0 −7
Original line number Diff line number Diff line
@@ -911,13 +911,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
            mOverrideOptions = null;

            return;

        }

        // Ensure that wallpaper visibility is updated with the latest wallpaper target.

        for (int i = mParticipants.size() - 1; i >= 0; --i) {

            final WindowContainer<?> wc = mParticipants.valueAt(i);

            if (isWallpaper(wc) && wc.getDisplayContent() != null) {

                wc.getDisplayContent().mWallpaperController.adjustWallpaperWindows();

            }

        }



        mState = STATE_PLAYING;

        mStartTransaction = transaction;

services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java

+0 −9
Original line number Diff line number Diff line
@@ -372,15 +372,6 @@ public class WallpaperControllerTests extends WindowTestsBase { 
        dc.mTransitionController.finishTransition(transit);

        assertFalse(wallpaperWindow.isVisible());

        assertFalse(token.isVisible());



        // Assume wallpaper was visible. When transaction is ready without wallpaper target,

        // wallpaper should be requested to be invisible.

        token.setVisibility(true);

        transit = dc.mTransitionController.createTransition(TRANSIT_CLOSE);

        dc.mTransitionController.collect(token);

        transit.onTransactionReady(transit.getSyncId(), t);

        assertFalse(token.isVisibleRequested());

        assertTrue(token.isVisible());

    }



    private static void prepareSmallerSecondDisplay(DisplayContent dc, int width, int height) {