commit dd7669a4c7dd6b8cd0e53f865be3ff05af7323cd
author Ikram Gabiyev <gabiyev@google.com> Fri May 24 15:52:04 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 24 15:52:04 2024 +0000
tree c16b31eab3b58e8774d3048b84cd072feb465e88
parent bad3348bc8fda24d281a3b124d87e07df268b74b
parent 0f7d92bd7609b9609762f1d7cb853614c444fb19

Merge "Disallow userLeaving when split drag drop" into 24D1-dev

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;
             }