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

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

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

Change-Id: I3577a3bca11d4a18317e38545a9bfa963ece5259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-30 12:45:39 +00:00
committed by Automerger Merge Worker
parent 7037009a1d 94ec86fed0
commit 38400706fb
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. // 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. // Note that mStartActivity and source should be in the same Task at this point.
if (mOptions != null && mOptions.isLaunchIntoPip() if (mOptions != null && mOptions.isLaunchIntoPip()
&& sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()) { && sourceRecord != null && sourceRecord.getTask() == mStartActivity.getTask()
&& !mRestrictedBgActivity) {
mRootWindowContainer.moveActivityToPinnedRootTask(mStartActivity, mRootWindowContainer.moveActivityToPinnedRootTask(mStartActivity,
sourceRecord, "launch-into-pip"); sourceRecord, "launch-into-pip");
} }