commit 446102d48adaf1bbd196a95bb22970d74ecb1f36
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 30 09:36:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 30 09:36:48 2023 +0000
tree 002299056a5feddd123f51dcb22b69868dda40ed
parent 7213e92fca72805d39277b708f8925104044559a
parent 291d124257f6e46862a813305892b02b9a8f851c

Merge "Update Pip launches to not enter pinned task if in background." into tm-qpr-dev

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

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index d1a5ead..4d5238a 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1709,7 +1709,8 @@
         // If Activity's launching into PiP, move the mStartActivity immediately to pinned mode.
         // Note that mStartActivity and source should be in the same Task at this point.
         if (mOptions != null && mOptions.isLaunchIntoPip()
-                && sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()) {
+                && sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()
+                && balCode != BAL_BLOCK) {
             mRootWindowContainer.moveActivityToPinnedRootTask(mStartActivity,
                     sourceRecord, "launch-into-pip");
         }