diff options
| author | 2023-05-30 12:45:02 +0000 | |
|---|---|---|
| committer | 2023-05-30 12:45:02 +0000 | |
| commit | 660ba920bfb40071c03a9847d3ae75fc4a8edcf5 (patch) | |
| tree | 4b0f0fc8138813a69a82498c0f4d22acd446a649 | |
| parent | 6d45646dd44b5f94b665871932ee6012f0d421e4 (diff) | |
| parent | 94ec86fed0042a8ca79b839feeab1e49d5a627cf (diff) | |
Merge "Update Pip launches to not enter pinned task if in background." into tm-dev am: 94ec86fed0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23389120
Change-Id: I9a8362b426af4eba8365388bf2cb9751c4cf981b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index ec9babf09ef3..4633e34f78f6 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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"); } |