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

Merge "Limit number of recents entries for an app to maxRecents allowed." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-09 18:25:02 +00:00
committed by Android (Google) Code Review
parent 3025e6be7f 847167fe3d
commit 6529ab20fb
1 changed files with 8 additions and 3 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

@@ -653,12 +653,17 @@ class RecentTasks extends ArrayList<TaskRecord> {
&& task.realActivity.equals(tr.realActivity);
// If the document is open in another app or is not the same
// document, we don't need to trim it.
if (!sameActivity || !sameIntentFilter || multiTasksAllowed) {
if (!sameActivity) {
continue;
// Otherwise only trim if we are over our max recents for this task
} else if (maxRecents > 0 && !doTrim) {
} else if (maxRecents > 0) {
--maxRecents;
continue;
if (!doTrim || !sameIntentFilter || multiTasksAllowed) {
// We don't want to trim if we are not over the max allowed entries and
// the caller doesn't want us to trim, the tasks are not of the same
// intent filter, or multiple entries fot the task is allowed.
continue;
}
}
// Hit the maximum number of documents for this task. Fall through
// and remove this document from recents.