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

Merge "Manual revert of ag/6502936" into qt-dev

Browse Source
This commit is contained in:
Winson Chung
2019-04-25 05:52:07 +00:00
committed by Android (Google) Code Review
parent 4d304d67b8 0a10c3a571
commit 671a62fffb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -884,7 +884,7 @@ class RecentTasks {
if (isVisibleRecentTask(tr)) {
numVisibleTasks++;
if (isInVisibleRange(tr, numVisibleTasks, withExcluded)) {
if (isInVisibleRange(tr, i, numVisibleTasks, withExcluded)) {
// Fall through
} else {
// Not in visible range
@@ -989,7 +989,7 @@ class RecentTasks {
final TaskRecord tr = mTasks.get(i);
if (isVisibleRecentTask(tr)) {
numVisibleTasks++;
if (isInVisibleRange(tr, numVisibleTasks, false /* skipExcludedCheck */)) {
if (isInVisibleRange(tr, i, numVisibleTasks, false /* skipExcludedCheck */)) {
res.put(tr.taskId, true);
}
}
@@ -1210,7 +1210,7 @@ class RecentTasks {
continue;
} else {
numVisibleTasks++;
if (isInVisibleRange(task, numVisibleTasks, false /* skipExcludedCheck */)
if (isInVisibleRange(task, i, numVisibleTasks, false /* skipExcludedCheck */)
|| !isTrimmable(task)) {
// Keep visible tasks in range
i++;
@@ -1325,7 +1325,7 @@ class RecentTasks {
/**
* @return whether the given visible task is within the policy range.
*/
private boolean isInVisibleRange(TaskRecord task, int numVisibleTasks,
private boolean isInVisibleRange(TaskRecord task, int taskIndex, int numVisibleTasks,
boolean skipExcludedCheck) {
if (!skipExcludedCheck) {
// Keep the most recent task even if it is excluded from recents
@@ -1334,7 +1334,7 @@ class RecentTasks {
== FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
if (isExcludeFromRecents) {
if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "\texcludeFromRecents=true");
return numVisibleTasks == 1;
return taskIndex == 0;
}
}