diff options
| author | 2024-04-03 06:00:05 +0000 | |
|---|---|---|
| committer | 2024-04-03 06:33:35 +0000 | |
| commit | 97b32aa069564ad40b52c277384eaf2f1369cb70 (patch) | |
| tree | 36335d0e8cee954b70dc2022f20634dcd3727466 | |
| parent | 4ce707990cdcf0ea0af5a19159ab968db8bede80 (diff) | |
No-op when a transition happening on other display finished
Or it could accidentally reset the activity state in
other displays.
Bug: 326610743
Test: make apps enter auto-pip while recording screen
Change-Id: Ifb82fcaff76451f8dc17091c9cf82e12d718f387
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index fe280cbcc205..fc029d92f0c5 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -6997,7 +6997,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp // by finishing the recents animation and moving it to top. That also avoids flickering // due to wait for previous activity to be paused if it supports PiP that ignores the // effect of resume-while-pausing. - if (r == null || r == mAnimatingRecents) { + if (r == null || r == mAnimatingRecents || r.getDisplayId() != mDisplayId) { return; } if (mAnimatingRecents != null && mRecentsWillBeTop) { |