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

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

Browse Source 
* commit 'ecb738638c98de53fdd96e53147f63a6385f3b24':
  Don't exceed max. allowed recent document tasks for an app.
This commit is contained in:
Stefan Kuhne
2015-05-20 19:04:36 +00:00
committed by Android Git Automerger
parent 7589b41ae7 ecb738638c
commit d06cefbce4
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 recentsCount = size();
final Intent intent = task.intent;
final boolean document = intent != null && intent.isDocument();
final boolean document = task.intent != null && task.intent.isDocument();
int maxRecents = task.maxRecents - 1;
for (int i = 0; i < recentsCount; i++) {
final TaskRecord tr = get(i);
@@ -448,12 +446,11 @@ class RecentTasks extends ArrayList<TaskRecord> {
if (i > MAX_RECENT_BITMAPS) {
tr.freeLastThumbnail();
}
final Intent trIntent = tr.intent;
if ((task.affinity == null || !task.affinity.equals(tr.affinity)) &&
(intent == null || !intent.filterEquals(trIntent))) {
if (task.realActivity == null || tr.realActivity == null ||
!task.realActivity.equals(tr.realActivity)) {
continue;
}
final boolean trIsDocument = trIntent != null && trIntent.isDocument();
final boolean trIsDocument = tr.intent != null && tr.intent.isDocument();
if (document && trIsDocument) {
// These are the same document activity (not necessarily the same doc).
if (maxRecents > 0) {