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

Commit 38e21070 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid creating new instance when started for result with... 

Merge "Avoid creating new instance when started for result with singleInstance/singleTask" into sc-dev
parents 5759b004 f714906c

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

+4 −3
Original line number Diff line number Diff line
@@ -1814,8 +1814,7 @@ class ActivityStarter { 
    }



    private Task computeTargetTask() {

        if (mStartActivity.resultTo == null && mInTask == null && !mAddingToTask

                && (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {

        if (mInTask == null && !mAddingToTask && (mLaunchFlags & FLAG_ACTIVITY_NEW_TASK) != 0) {

            // A new task should be created instead of using existing one.

            return null;

        } else if (mSourceRecord != null) {
@@ -2505,7 +2504,9 @@ class ActivityStarter { 
        // If bring to front is requested, and no result is requested and we have not been given

        // an explicit task to launch in to, and we can find a task that was started with this

        // same component, then instead of launching bring that one to the front.

        putIntoExistingTask &= mInTask == null && mStartActivity.resultTo == null;

        putIntoExistingTask &= !isLaunchModeOneOf(LAUNCH_SINGLE_INSTANCE, LAUNCH_SINGLE_TASK)

                ? (mInTask == null && mStartActivity.resultTo == null)

                : (mInTask == null);

        ActivityRecord intentActivity = null;

        if (putIntoExistingTask) {

            if (LAUNCH_SINGLE_INSTANCE == mLaunchMode) {