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

Commit d4c66e77 authored by Louis Chang's avatar Louis Chang
Browse files

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
(cherry picked from commit 97b32aa0)
parent d0c90f57

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

+1 −1
Original line number Diff line number Diff line
@@ -7028,7 +7028,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) {