Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f42f3e3 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Removes the hidden tasks that exceeds the cache limit" into udc-qpr-dev am: 7c284c0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24844116



Change-Id: I727967c134976f617df9e7395029d63b36fd9057
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5e8ee68 7c284c0e

services/core/java/com/android/server/wm/RecentTasks.java

+9 −3
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ class RecentTasks { 


    /** The non-empty tasks that are removed from recent tasks (see {@link #removeForAddTask}). */

    private final ArrayList<Task> mHiddenTasks = new ArrayList<>();

    /** The maximum size that the hidden tasks are cached. */

    private static final int MAX_HIDDEN_TASK_SIZE = 10;



    /** Whether to trim inactive tasks when activities are idle. */

    private boolean mCheckTrimmableTasksOnIdle;
@@ -1497,9 +1499,13 @@ class RecentTasks { 
        return task.compareTo(rootHomeTask) < 0;

    }



    /** Remove the tasks that user may not be able to return. */

    /** Remove the tasks that user may not be able to return when exceeds the cache limit. */

    private void removeUnreachableHiddenTasks(int windowingMode) {

        for (int i = mHiddenTasks.size() - 1; i >= 0; i--) {

        final int size = mHiddenTasks.size();

        if (size <= MAX_HIDDEN_TASK_SIZE) {

            return;

        }

        for (int i = size - 1; i >= MAX_HIDDEN_TASK_SIZE; i--) {

            final Task hiddenTask = mHiddenTasks.get(i);

            if (!hiddenTask.hasChild() || hiddenTask.inRecents) {

                // The task was removed by other path or it became reachable (added to recents).
@@ -1543,7 +1549,7 @@ class RecentTasks { 
                // A non-empty task is replaced by a new task. Because the removed task is no longer

                // managed by the recent tasks list, add it to the hidden list to prevent the task

                // from becoming dangling.

                mHiddenTasks.add(removedTask);

                mHiddenTasks.add(0, removedTask);

            }

            notifyTaskRemoved(removedTask, false /* wasTrimmed */, false /* killProcess */);

            if (DEBUG_RECENTS_TRIM_TASKS) {