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

Commit d2555252 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Consolidate the embedding activity check" into sc-v2-dev am: 125ff5d6 am: 97cae868 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15896788

Change-Id: Id8ec85814a3244a1082300de46814bc7af7a06ff
parents 7e182f4e 97cae868

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

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