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

Merge "Consolidate the embedding activity check" into sc-v2-dev am: 125ff5d696 am: 97cae86888

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

Change-Id: Id8ec85814a3244a1082300de46814bc7af7a06ff
This commit is contained in:
Louis Chang
2021-09-24 07:35:25 +00:00
committed by Automerger Merge Worker
parent 7e182f4e18 97cae86888
commit d2555252a5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2855,7 +2855,7 @@ class ActivityStarter {
false /* includingEmbeddedTask */);
final TaskFragment taskFragment = top != null ? top.getTaskFragment() : null;
if (taskFragment != null && taskFragment.isEmbedded()
&& task.effectiveUid == mStartActivity.getUid()) {
&& canEmbedActivity(taskFragment, mStartActivity, false /* newTask */, task)) {
// Use the embedded TaskFragment of the top activity as the new parent if the
// activity can be embedded.
newParent = top.getTaskFragment();