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

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

@@ -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

@@ -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;