From d26e079df17e7d8f51fc0e0a652d72b9c67ee343 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Mon, 12 Oct 2015 14:06:34 -0700
Subject: [PATCH] Ensure recent documents are trimmed when relaunching.

With respect to recents trimming, documents excercise a
a special code path, where the number of open documents
is compared to a configured max documents. In fact though
if we have mandated a trim (regardless of recents size)
we don't care about this max documents number.

Bug: 24717461
Change-Id: I2ffb4a037307d666ea0a7f31d75638b64b6eab8e
---
 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 b2161149d663d..edd16ef257802 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -465,7 +465,7 @@ class RecentTasks extends ArrayList<TaskRecord> {
                     if (!sameActivity) {
                         continue;
                     }
-                    if (maxRecents > 0) {
+                    if (maxRecents > 0 && !doTrim) {
                         --maxRecents;
                         continue;
                     }