commit 2102af060062833b151b4b01f975350b8a7a3a49
author Daniel Chapin <chapin@google.com> Sat Feb 22 00:12:50 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Feb 25 04:05:17 2020 +0000
tree 71bc19dfa21aa0aef69b8583e16de1f1b1be2663
parent 92a5ff054a98053a4ccca382cd7f0c7ba6399162

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 e0012bda2adf8f00c6f159a5210b43c0bc692272)

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
(cherry picked from commit de8fadecbb520c6b2a9fb8faa9bd4de7e2dea9c4)

Change-Id: I1336fb5040e7d9ddc4f49dc8ff4bca62ca9922eb

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

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index 600a125..8878dee 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1813,12 +1813,12 @@
      */
     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()
                 && ((mLaunchFlags & FLAG_ACTIVITY_SINGLE_TOP) != 0
-                    || isLaunchModeOneOf(LAUNCH_SINGLE_TOP, LAUNCH_SINGLE_TASK))
+                || isLaunchModeOneOf(LAUNCH_SINGLE_TOP, LAUNCH_SINGLE_TASK))
                 // This allows home activity to automatically launch on secondary display when
                 // display added, if home was the top activity on default display, instead of
                 // sending new intent to the home activity on default display.
@@ -2049,6 +2049,8 @@
                 && !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 @@
                 mLaunchFlags |= FLAG_ACTIVITY_NEW_TASK;
             }
         }
-
-        sendNewTaskResultRequestIfNeeded();
     }
 
     private void computeSourceStack() {