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

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

Merge "Check isOnScreen for wallpaper target of recents animation" into rvc-qpr-dev

parents 31534b74 70eba483

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

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ public class RecentsAnimationController implements DeathRecipient { 
        return w != null && w.mAttrs.type == TYPE_BASE_APPLICATION &&

                ((w.mActivityRecord != null && mTargetActivityRecord == w.mActivityRecord)

                        || isAnimatingTask(w.getTask()))

                && isTargetOverWallpaper();

                && isTargetOverWallpaper() && w.isOnScreen();

    }



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 


        final WindowState homeWindow = createWindow(null, TYPE_BASE_APPLICATION, homeActivity,

                "homeWindow");

        makeWindowVisible(homeWindow);

        homeActivity.addWindow(homeWindow);

        homeWindow.getAttrs().flags |= FLAG_SHOW_WALLPAPER;