Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 242a5004: Merge "Don\'t exceed max. allowed recent document tasks for an app." into mnc-dev

Browse Source 
* commit '242a500491a2ce14910f31a751c47bc72f986e97':
  Don't exceed max. allowed recent document tasks for an app.
This commit is contained in:
Stefan Kuhne
2015-05-20 18:50:52 +00:00
committed by Android Git Automerger
parent 46b7038811 242a500491
commit ecb738638c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/RecentTasks.java
View File

@@ -435,9 +435,7 @@ class RecentTasks extends ArrayList<TaskRecord> {
*/ */
int trimForTaskLocked(TaskRecord task, boolean doTrim) { int trimForTaskLocked(TaskRecord task, boolean doTrim) {
int recentsCount = size(); int recentsCount = size();
final Intent intent = task.intent; final boolean document = task.intent != null && task.intent.isDocument();
final boolean document = intent != null && intent.isDocument();
int maxRecents = task.maxRecents - 1; int maxRecents = task.maxRecents - 1;
for (int i = 0; i < recentsCount; i++) { for (int i = 0; i < recentsCount; i++) {
final TaskRecord tr = get(i); final TaskRecord tr = get(i);
@@ -448,12 +446,11 @@ class RecentTasks extends ArrayList<TaskRecord> {
if (i > MAX_RECENT_BITMAPS) { if (i > MAX_RECENT_BITMAPS) {
tr.freeLastThumbnail(); tr.freeLastThumbnail();
} }
final Intent trIntent = tr.intent; if (task.realActivity == null || tr.realActivity == null ||
if ((task.affinity == null || !task.affinity.equals(tr.affinity)) && !task.realActivity.equals(tr.realActivity)) {
(intent == null || !intent.filterEquals(trIntent))) {
continue; continue;
} }
final boolean trIsDocument = trIntent != null && trIntent.isDocument(); final boolean trIsDocument = tr.intent != null && tr.intent.isDocument();
if (document && trIsDocument) { if (document && trIsDocument) {
// These are the same document activity (not necessarily the same doc). // These are the same document activity (not necessarily the same doc).
if (maxRecents > 0) { if (maxRecents > 0) {