Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1850ba18 authored by Louis Chang's avatar Louis Chang
Browse files

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
parent 7bf1e9b7

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Diff line number Diff line
@@ -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();