From 1850ba18fa20a01cf7f9980d15f477fc0be98a71 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Thu, 23 Sep 2021 21:08:47 +0800 Subject: Consolidate the embedding activity check So that it can go through the same embedding checks, such as checking if the task was host by system uid, when adding an activity on a Task in split. Bug: 189386461 Bug: 197364677 Test: start partner apps from Settings Change-Id: Iede880956b73178d075d1305e29fe4fcc057d770 --- services/core/java/com/android/server/wm/ActivityStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); -- cgit v1.2.3-59-g8ed1b