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

Commit 76aaccb9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "Avoid creating new instance on top when started for resu...""... 

Merge "Revert "Avoid creating new instance on top when started for resu..."" into rvc-dev am: e44eb5b9

Change-Id: I1f358bddd32edaed2c642da283f8ce4634c273bf
parents 25c6573d e44eb5b9

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

+4 −4
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ class ActivityStarter { 
     */

    private int deliverToCurrentTopIfNeeded(ActivityStack topStack) {

        final ActivityRecord top = topStack.topRunningNonDelayedActivityLocked(mNotTop);

        final boolean dontStart = top != null

        final boolean dontStart = top != null && mStartActivity.resultTo == null

                && top.mActivityComponent.equals(mStartActivity.mActivityComponent)

                && top.mUserId == mStartActivity.mUserId

                && top.attachedToProcess()
@@ -2055,6 +2055,8 @@ class ActivityStarter { 
                && !isLaunchModeOneOf(LAUNCH_SINGLE_TASK, LAUNCH_SINGLE_INSTANCE)

                && (mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0;



        sendNewTaskResultRequestIfNeeded();



        if ((mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0 && r.resultTo == null) {

            mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;

        }
@@ -2236,8 +2238,6 @@ class ActivityStarter { 
                mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;

            }

        }



        sendNewTaskResultRequestIfNeeded();

    }



    private void computeSourceStack() {