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

Commit f622c62b authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Revert f714906c for startActivityForResult" into sc-dev am: 6742af3a 

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

Change-Id: Ieef1d224b7e42c1ef689c065c03bfb699af8675d
parents 1e1688a8 6742af3a

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

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



    private Task computeTargetTask() {

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

        if (mStartActivity.resultTo == null && 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) {
@@ -2516,9 +2517,7 @@ 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 &= !isLaunchModeOneOf(LAUNCH_SINGLE_INSTANCE, LAUNCH_SINGLE_TASK)

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

                : (mInTask == null);

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

        ActivityRecord intentActivity = null;

        if (putIntoExistingTask) {

            if (LAUNCH_SINGLE_INSTANCE == mLaunchMode) {