Merge "Ensure recent documents are trimmed when relaunching."

2015-10-12 23:17:31 +00:00
parent 8b6c79f5fc d26e079df1
commit 130c34bfa6
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
@@ -465,7 +465,7 @@ class RecentTasks extends ArrayList<TaskRecord> {
                    if (!sameActivity) {
                        continue;
                    }
-                    if (maxRecents > 0) {
+                    if (maxRecents > 0 && !doTrim) {
                        --maxRecents;
                        continue;
                    }