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

am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev

Browse Source 
* commit 'f85769797e14f0d10dcc99d695c6dee1eb56bd9c':
  Also consider task intent when trimming recent tasks
This commit is contained in:
Wale Ogunwale
2015-08-03 20:39:46 +00:00
committed by Android Git Automerger
parent e0d8a6ff60 f85769797e
commit 5e4be98e40
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,7 +435,8 @@ class RecentTasks extends ArrayList<TaskRecord> {
*/
int trimForTaskLocked(TaskRecord task, boolean doTrim) {
int recentsCount = size();
final boolean document = task.intent != null && task.intent.isDocument();
final Intent intent = task.intent;
final boolean document = intent != null && intent.isDocument();
int maxRecents = task.maxRecents - 1;
for (int i = 0; i < recentsCount; i++) {
final TaskRecord tr = get(i);
@@ -446,12 +447,13 @@ class RecentTasks extends ArrayList<TaskRecord> {
if (i > MAX_RECENT_BITMAPS) {
tr.freeLastThumbnail();
}
final Intent trIntent = tr.intent;
final boolean sameAffinity =
task.affinity != null && task.affinity.equals(tr.affinity);
final boolean trIsDocument = tr.intent != null && tr.intent.isDocument();
final boolean sameIntent = (intent != null && intent.filterEquals(trIntent));
final boolean trIsDocument = trIntent != null && trIntent.isDocument();
final boolean bothDocuments = document && trIsDocument;
if (!sameAffinity && !bothDocuments) {
// Not the same affinity and not documents. Move along...
if (!sameAffinity && !sameIntent && !bothDocuments) {
continue;
}