summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/RecentTasks.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index ab5d4b650748..5c05ab64e199 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -621,7 +621,7 @@ class RecentTasks extends ArrayList<TaskRecord> {
for (int i = 0; i < recentsCount; i++) {
final TaskRecord tr = get(i);
if (task != tr) {
- if (task.stack != tr.stack) {
+ if (task.stack != null && tr.stack != null && task.stack != tr.stack) {
continue;
}
if (task.userId != tr.userId) {