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

Browse Source
This commit is contained in:
Louis Chang
2021-09-24 06:57:15 +00:00
committed by Android (Google) Code Review
parent 6bb4d07b6a 1850ba18fa
commit 125ff5d696
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

@@ -2809,7 +2809,7 @@ class ActivityStarter {
false /* includingEmbeddedTask */); false /* includingEmbeddedTask */);
final TaskFragment taskFragment = top != null ? top.getTaskFragment() : null; final TaskFragment taskFragment = top != null ? top.getTaskFragment() : null;
if (taskFragment != null && taskFragment.isEmbedded() 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 // Use the embedded TaskFragment of the top activity as the new parent if the
// activity can be embedded. // activity can be embedded.
newParent = top.getTaskFragment(); newParent = top.getTaskFragment();