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

Commit 660ba920 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fe 

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



Change-Id: I9a8362b426af4eba8365388bf2cb9751c4cf981b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d45646d 94ec86fe

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

+2 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,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()

                && !mRestrictedBgActivity) {

            mRootWindowContainer.moveActivityToPinnedRootTask(mStartActivity,

                    sourceRecord, "launch-into-pip");

        }