diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 3d9edcac8eb1..5f2d3ca8175b 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -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; |