From a2aa3eadec7539e7bc5f3200d93849705dc5ea86 Mon Sep 17 00:00:00 2001
From: Winson <chiuwinson@google.com>
Date: Wed, 2 Mar 2022 11:38:08 -0800
Subject: [PATCH] Null check inside filterIfNotSystemUser

List<ResolveInfo> is defined as nullable, so if that ever happens,
need to handle it in the filter method.

Bug: 222180729

Test: presubmit

Change-Id: I84e8b66485f226e0d01074e01c77fa0b71f37122
---
 services/core/java/com/android/server/pm/ComputerEngine.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index ca3ee8558dd0d..5f2e9f2e4a73d 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -1431,7 +1431,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);