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

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

Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity."... 

Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." am: 5fa55ef1 am: 5c917b8f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa3e7e53814477d7c53dffdcad8daadac06de135
parents 5bbee4a0 5c917b8f

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

+0 −7
Original line number Diff line number Diff line
@@ -2023,13 +2023,6 @@ class ActivityStarter { 
            final ActivityRecord top = targetTask.performClearTaskForReuseLocked(mStartActivity,

                    mLaunchFlags);



            // The above code can remove {@code reusedActivity} from the task, leading to the

            // {@code ActivityRecord} removing its reference to the {@code Task}. The task

            // reference is needed in the call below to {@link setTargetStackAndMoveToFrontIfNeeded}

            if (targetTaskTop.getTask() == null) {

                targetTask.addChild(targetTaskTop);

            }



            if (top != null) {

                if (top.isRootOfTask()) {

                    // Activity aliases may mean we use different intents for the top activity,