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

Commit 291d1242 authored by Hani Kazmi's avatar Hani Kazmi
Browse files

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

Addresses a BAL bypass where Pip could be started without the launcher
being visible.

Bug: 271576718
Test: atest CtsWindowManagerDeviceTestCases:PinnedStackTests
Test: atest android.server.wm.BackgroundActivityLaunchTest#testPipCannotStartFromBackground
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b263d3beed7a412ac342c63956f213b70d6e2679)
Merged-In: Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad
Change-Id: Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad
parent 6c3482b1

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

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

        }