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

Commit 5fa55ef1 authored by Louis Chang's avatar Louis Chang Committed by Gerrit Code Review
Browse files

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

parents 8cb6d958 9f748c39
Loading
Loading
Loading
Loading
+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,