diff options
| author | Winson <winsonc@google.com> | 2016-06-15 01:29:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-15 01:29:42 +0000 |
| commit | b205f5a997cc16f87cb15fa27fac1272df4f23f0 (patch) | |
| tree | 993bcd09174fd80e35c8aaffddd37b1937f006cc | |
| parent | e2b87c4b7aad158fd0898bd4865ffb122ed40fe8 (diff) | |
| parent | 87cff0ba08d590e435cbb12a780706e568a7b7c0 (diff) | |
Merge \\\"Only skip trimming task if the stacks are not null.\\\" into nyc-dev am: 6ba96df815 am: f654d3e081
am: 87cff0ba08
Change-Id: Ieec94ccf440a737e39551f5b264509d017ec9665
| -rw-r--r-- | services/core/java/com/android/server/am/RecentTasks.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java index ab5d4b650748..5c05ab64e199 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) { |