Merge "Prevent exit transition when a new task was started."

1 files changed, 4 insertions, 5 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 2914a61b9552..7934705cb844 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -3704,9 +3704,6 @@ public class Activity extends ContextThemeWrapper
      * @see #startActivity
      */
     public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) {
-        if (options != null) {
-            mActivityTransitionState.startExitOutTransition(this, options);
-        }
         if (mParent == null) {
             Instrumentation.ActivityResult ar =
                 mInstrumentation.execStartActivity(
@@ -3742,6 +3739,9 @@ public class Activity extends ContextThemeWrapper
                 mParent.startActivityFromChild(this, intent, requestCode);
             }
         }
+        if (options != null && !isTopOfTask()) {
+            mActivityTransitionState.startExitOutTransition(this, options);
+        }
     }
 
     /**
@@ -5207,9 +5207,8 @@ public class Activity extends ContextThemeWrapper
      * another task.
      *
      * @return true if this is the topmost, non-finishing activity in its task.
-     * @hide
      */
-    public boolean isTopOfTask() {
+    private boolean isTopOfTask() {
         try {
             return ActivityManagerNative.getDefault().isTopOfTask(mToken);
         } catch (RemoteException e) {