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

Commit de8fadec authored by Daniel Chapin's avatar Daniel Chapin Committed by Louis Chang
Browse files

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

Revert "Add tests for start singleTop/singleInstance activity fo..."

Revert submission 10112771-single-for-result

Reason for revert: b/149877125
Reverted Changes:
I923a0d9aa:Avoid creating new instance on top when started fo...
I7d47580f8:Add tests for start singleTop/singleInstance activ...

Change-Id: Ice262d1b8cada3b6c6fe0a5e8000bb59e0536596
(cherry picked from commit e0012bda)

It appears that the original reverts missed the master cutover to rvc-dev
for rvc-release builds.  b/150138994 tracks this issue

Bug: 149877125
Bug: 150138994
parent 27f83cdb

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

+4 −4
Original line number Diff line number Diff line
@@ -1813,7 +1813,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()
@@ -2049,6 +2049,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;

        }
@@ -2230,8 +2232,6 @@ class ActivityStarter { 
                mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;

            }

        }



        sendNewTaskResultRequestIfNeeded();

    }



    private void computeSourceStack() {