Only skip trimming task if the stacks are not null.

Bug: 29121819, 29359871 Change-Id: I8f8602796e316ed5b36a033e4eaa020650064f74
2016-06-14 15:39:27 -07:00
parent 8e3a16ad91
commit e5266730eb
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) {