commit 0f7d92bd7609b9609762f1d7cb853614c444fb19
author Ikram Gabiyev <gabiyev@google.com> Wed May 22 15:47:02 2024 -0700
committer Ikram Gabiyev <gabiyev@google.com> Thu May 23 22:34:58 2024 +0000
tree aa20a60ccbc5203418dad093e2eb16d637526baa
parent 4fccc4e1696797f21dc0083f995d64fa25b34a05

Disallow userLeaving when split drag drop

We should avoid setting mUserLeaving=true when
bringing task to front that disallow entering PiP
due to the launching task coming to front.

Bug: 336477473
Test: repro the steps in the bug report
Change-Id: I94377538ab922b2ca03f295a847a8b8e4d1904df
(cherry picked from commit 86860b8e659b51dd48fffb3197a30d15b8482d3f)

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

diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
index f9c2c7e..30dedb2 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
@@ -1512,7 +1512,10 @@
         }
 
         try {
-            if ((flags & ActivityManager.MOVE_TASK_NO_USER_ACTION) == 0) {
+            // We allow enter PiP for previous front task if not requested otherwise via options.
+            boolean shouldCauseEnterPip = options == null
+                    || !options.disallowEnterPictureInPictureWhileLaunching();
+            if ((flags & ActivityManager.MOVE_TASK_NO_USER_ACTION) == 0 && shouldCauseEnterPip) {
                 mUserLeaving = true;
             }