Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev

am: 6ba96df815 Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa
2016-06-15 01:16:02 +00:00
parent 5df969f778 6ba96df815
commit f9eed3bf86
1 changed files with 1 additions and 1 deletions
--- 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) {