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

Commit d88d571b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Also check PiP activity visibility to determine if enter-pip"... 

Merge "Merge "Also check PiP activity visibility to determine if enter-pip" into udc-dev am: cc054b94" into udc-dev-plus-aosp
parents 8cb94437 c0539235

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

+3 −2
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        if (ar.pictureInPictureArgs != null && ar.pictureInPictureArgs.isAutoEnterEnabled()) {

            if (didCommitTransientLaunch()) {

            if (!ar.getTask().isVisibleRequested() || didCommitTransientLaunch()) {

                // force enable pip-on-task-switch now that we've committed to actually launching

                // to the transient activity.

                ar.supportsEnterPipOnTaskSwitch = true;
@@ -1008,7 +1008,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        }



        // Legacy pip-entry (not via isAutoEnterEnabled).

        if (didCommitTransientLaunch() && ar.supportsPictureInPicture()) {

        if ((!ar.getTask().isVisibleRequested() || didCommitTransientLaunch())

                && ar.supportsPictureInPicture()) {

            // force enable pip-on-task-switch now that we've committed to actually launching to the

            // transient activity, and then recalculate whether we can attempt pip.

            ar.supportsEnterPipOnTaskSwitch = true;