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

Commit 6308584d authored by Winson Chung's avatar Winson Chung
Browse files

Fix regression from ag/2987716 



- Removing some tasks can trigger the list to be updated (for the removed
  task), ensure that we iterate the list backwards so that iteration is
  not affected by any removed tasks.

Bug: 67785147
Test: Just reverting some code

Change-Id: If8afc222f62656cbf5404bcf79c70833514103e7
Signed-off-by: default avatarWinson Chung <winsonc@google.com>
parent a7963492

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

+2 −4
Original line number Diff line number Diff line
@@ -427,8 +427,7 @@ class RecentTasks { 
    }



    void removeTasksByPackageName(String packageName, int userId) {

        final int size = mTasks.size();

        for (int i = 0; i < size; i++) {

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

            final TaskRecord tr = mTasks.get(i);

            final String taskPackageName =

                    tr.getBaseIntent().getComponent().getPackageName();
@@ -441,8 +440,7 @@ class RecentTasks { 


    void cleanupDisabledPackageTasksLocked(String packageName, Set<String> filterByClasses,

            int userId) {

        final int size = mTasks.size();

        for (int i = 0; i < size; i++) {

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

            final TaskRecord tr = mTasks.get(i);

            if (userId != UserHandle.USER_ALL && tr.userId != userId) {

                continue;