From 29dbc3cc47a27ae09f0f5aacd778aded427444bc Mon Sep 17 00:00:00 2001
From: Winson <winsonc@google.com>
Date: Wed, 8 Jun 2016 12:49:54 -0700
Subject: [PATCH] Prevent trimming recent tasks belonging in different stacks.

- When launching an adjacent task, we usually have the same activity
  not necessarily launched with MULTIPLE_TASK, so the old recent task
  is incorrectly found removed.

Bug: 29121819
Change-Id: Id3bbafe0d3c535fd1a05bb373e521345c18f43d5
---
 services/core/java/com/android/server/am/RecentTasks.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index cea76f236fc9..ab5d4b650748 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -621,6 +621,9 @@ 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) {
+                    continue;
+                }
                 if (task.userId != tr.userId) {
                     continue;
                 }
-- 
2.11.0