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

Commit 6c4cd25a authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

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

parents 614ed9e0 7492cc27

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");

        }