Fixed the case where the task was moved to the front

Previously in the case that the task was moved to the front,
the wrong result would be returned.

Test: go/wm-smoke
Test: Use PendingIntent.sendAndReturnResult
Change-Id: Ifa2966bacc4235f45b74220336f2baae02d0ee9a

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index 8595aa394800..4dc30ddf4b5b 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1252,7 +1252,7 @@ class ActivityStarter {
                     outActivity[0] = reusedActivity;
                 }
 
-                return START_DELIVERED_TO_TOP;
+                return mMovedToFront ? START_TASK_TO_FRONT : START_DELIVERED_TO_TOP;
             }
         }