Merge "Null check inside filterIfNotSystemUser" into tm-dev

2022-03-22 13:58:59 +00:00
parent 005eea08b4 a2aa3eadec
commit fb8919fac7
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -1429,7 +1429,8 @@ public class ComputerEngine implements Computer {
        if (userId == UserHandle.USER_SYSTEM) {
            return resolveInfos;
        }
-        for (int i = resolveInfos.size() - 1; i >= 0; i--) {
+
+        for (int i = CollectionUtils.size(resolveInfos) - 1; i >= 0; i--) {
            ResolveInfo info = resolveInfos.get(i);
            if ((info.activityInfo.flags & ActivityInfo.FLAG_SYSTEM_USER_ONLY) != 0) {
                resolveInfos.remove(i);