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

Commit fb8919fa authored by Winson Chiu's avatar Winson Chiu Committed by Android (Google) Code Review
Browse files

Merge "Null check inside filterIfNotSystemUser" into tm-dev

parents 005eea08 a2aa3ead

services/core/java/com/android/server/pm/ComputerEngine.java

+2 −1
Original line number Diff line number Diff line
@@ -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);