From ec4e780e5c3ffacabe2e41dfbf40636744666859 Mon Sep 17 00:00:00 2001 From: Danny Baumann Date: Sun, 22 Jun 2014 16:55:36 +0200 Subject: [PATCH] Fix frontOfTask assignment. If all activities of a given stack were finishing, no activity was marked as front-of-task. This confused ActivityManager, so make sure there's always exactly one activity marked as front-of-task. Change-Id: I087cbe10280d4a60aa5ccfaefe24a223523fb3f2 --- services/java/com/android/server/am/TaskRecord.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/java/com/android/server/am/TaskRecord.java b/services/java/com/android/server/am/TaskRecord.java index 9105103ac6325..9c4b7d14ec262 100644 --- a/services/java/com/android/server/am/TaskRecord.java +++ b/services/java/com/android/server/am/TaskRecord.java @@ -173,6 +173,11 @@ final class TaskRecord extends ThumbnailHolder { foundFront = true; } } + if (!foundFront && numActivities > 0) { + // All activities of this task are finishing. As we ought to have a frontOfTask + // activity, make the bottom activity front. + mActivities.get(0).frontOfTask = true; + } } /**