Merge "Consolidate the embedding activity check" into sc-v2-dev

2021-09-24 06:57:15 +00:00
parent 6bb4d07b6a 1850ba18fa
commit 125ff5d696
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2809,7 +2809,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();