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

Commit ff2fba88 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

[PiP2] Don't update display layout for same id 

When getEnterPipTransaction() is called to get the WCT
we should only update the display layout if the task's displayId
is different from the cached one.

Bug: 394931678
Flag: com.android.wm.shell.enable_pip2
Test: swipe up to enter PiP from landscape mode
Change-Id: I0e4364b04218bd3ebc5ce9692e2791ae917844e7
parent 5da67811

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java

+2 −1
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ public class PipTransition extends PipTransitionController implements 


        // If PiP is enabled on Connected Displays, update PipDisplayLayoutState to have the correct

        // display info that PiP is entering in.

        if (mPipDesktopState.isConnectedDisplaysPipEnabled()) {

        if (mPipDesktopState.isConnectedDisplaysPipEnabled()

                && pipTask.displayId != mPipDisplayLayoutState.getDisplayId()) {

            final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(

                    pipTask.displayId);

            if (displayLayout != null) {