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

Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev

Browse Source
This commit is contained in:
Wale Ogunwale
2015-07-21 14:28:13 +00:00
committed by Android (Google) Code Review
parent b2eed1d6e1 7cbfcd8865
commit e99f20f587
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,13 +446,23 @@ class RecentTasks extends ArrayList<TaskRecord> {
if (i > MAX_RECENT_BITMAPS) {
tr.freeLastThumbnail();
}
if (task.realActivity == null || tr.realActivity == null ||
!task.realActivity.equals(tr.realActivity)) {
final boolean sameAffinity =
task.affinity != null && task.affinity.equals(tr.affinity);
final boolean trIsDocument = tr.intent != null && tr.intent.isDocument();
final boolean bothDocuments = document && trIsDocument;
if (!sameAffinity && !bothDocuments) {
// Not the same affinity and not documents. Move along...
continue;
}
final boolean trIsDocument = tr.intent != null && tr.intent.isDocument();
if (document && trIsDocument) {
// These are the same document activity (not necessarily the same doc).
if (bothDocuments) {
// Do these documents belong to the same activity?
final boolean sameActivity = task.realActivity != null
&& tr.realActivity != null
&& task.realActivity.equals(tr.realActivity);
if (!sameActivity) {
continue;
}
if (maxRecents > 0) {
--maxRecents;
continue;