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

Commit 37f160f4 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: 1b043cff

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



Change-Id: I84bd9769773c42b57f47081be9e7d3753c4103c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94875b71 1b043cff

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

+2 −1
Original line number Diff line number Diff line
@@ -1820,7 +1820,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");

        }