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

Commit 5f25758e authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Update Pip launches to not enter pinned task if in background." into... 

Merge "Update Pip launches to not enter pinned task if in background." into udc-dev am: 6c4cd25a am: cc96a236

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23369060



Change-Id: I3a4593eec83e698b743716dcd078f5592b064b4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c4ea6d2 cc96a236

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

+2 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,8 @@ class ActivityStarter { 
        // 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");

        }