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

1 files changed, 1 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 bab5a616a5c9..980ebf0646e8 100644
--- 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();