From e5266730ebee0e8db5e7881e0e78db22f67fba7b Mon Sep 17 00:00:00 2001
From: Winson <winsonc@google.com>
Date: Tue, 14 Jun 2016 15:39:27 -0700
Subject: [PATCH] Only skip trimming task if the stacks are not null.

Bug: 29121819, 29359871
Change-Id: I8f8602796e316ed5b36a033e4eaa020650064f74
---
 services/core/java/com/android/server/am/RecentTasks.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index ab5d4b6507480..5c05ab64e199a 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) {