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

Merge "Allow multiple recent entries for task with FLAG_ACTIVITY_MULTIPLE_TASK" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-25 17:51:12 +00:00
committed by Android (Google) Code Review
parent 08b38f87ef e8d5f65041
commit 442fd2a1dd
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,9 @@
package com.android.server.am; package com.android.server.am;
import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_RECENTS;
import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_TASKS;
import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_RECENTS; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_RECENTS;
@@ -624,10 +627,16 @@ class RecentTasks extends ArrayList<TaskRecord> {
final Intent trIntent = tr.intent; final Intent trIntent = tr.intent;
final boolean sameAffinity = final boolean sameAffinity =
task.affinity != null && task.affinity.equals(tr.affinity); task.affinity != null && task.affinity.equals(tr.affinity);
final boolean sameIntent = (intent != null && intent.filterEquals(trIntent)); final boolean sameIntentFilter = intent != null && intent.filterEquals(trIntent);
boolean multiTasksAllowed = false;
final int flags = intent.getFlags();
if ((flags & (FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_NEW_DOCUMENT)) != 0
&& (flags & FLAG_ACTIVITY_MULTIPLE_TASK) != 0) {
multiTasksAllowed = true;
}
final boolean trIsDocument = trIntent != null && trIntent.isDocument(); final boolean trIsDocument = trIntent != null && trIntent.isDocument();
final boolean bothDocuments = document && trIsDocument; final boolean bothDocuments = document && trIsDocument;
if (!sameAffinity && !sameIntent && !bothDocuments) { if (!sameAffinity && !sameIntentFilter && !bothDocuments) {
continue; continue;
} }
@@ -638,7 +647,7 @@ class RecentTasks extends ArrayList<TaskRecord> {
&& task.realActivity.equals(tr.realActivity); && task.realActivity.equals(tr.realActivity);
// If the document is open in another app or is not the same // If the document is open in another app or is not the same
// document, we don't need to trim it. // document, we don't need to trim it.
if (!sameActivity || !sameIntent) { if (!sameActivity || !sameIntentFilter || multiTasksAllowed) {
continue; continue;
// Otherwise only trim if we are over our max recents for this task // Otherwise only trim if we are over our max recents for this task
} else if (maxRecents > 0 && !doTrim) { } else if (maxRecents > 0 && !doTrim) {