summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2018-01-24 15:29:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-24 15:29:59 +0000
commit7c4cc2ea8c5d04fb1d836b3cef6c20fd9ab5202b (patch)
treec75ed378b74ee291546f15c885017eb3b2cd5c14
parentf5e4182d2fdf7cee3a95ed4734b7b2533bdeddc9 (diff)
parent7b1447e55fb7547b2014d685f7bf30e725438d83 (diff)
Merge "Fixed the case where the task was moved to the front"
-rw-r--r--services/core/java/com/android/server/am/ActivityStarter.java2
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;
}
}