commit 5ef215c7ccfca919744d861e4831d8e0236b1a9d
author Winson Chung <winsonc@google.com> Mon Oct 16 16:07:09 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 16:07:09 2017 +0000
tree 7a0d893e789697d6917baafdc4ddb7046dc996b6
parent a512d331ff05a4e17188c6d3f12b6b756d45c2b1
parent 6308584dd73ece4f3f95b93873455d5969be9cc5

Merge "Fix regression from ag/2987716"

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

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index 8fef6be..78274bd 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -427,8 +427,7 @@
     }
 
     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 @@
 
     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;