Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Change-Id: Ibadc9c21f1d23f9904fc11009a9c2a40535db5e0
Merged-In: Icfe0a17d7f6f127acaae8400a97e8bdc53fcc9ad
This commit is contained in:
Hani Kazmi
2023-05-23 17:28:56 +00:00
parent 92e32f91af
commit 1848b55905
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStarter.java
View File

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