Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167659

Change-Id: Ib96bb7318f531bb89466c455c000385d0d9066e6
This commit is contained in:
Riddle Hsu
2020-12-07 16:44:49 +00:00
committed by Automerger Merge Worker
parent 848458fae1 b4c3da0819
commit 8fc560cd54
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/RecentsAnimationController.java
View File

@@ -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();
}
/**

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

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