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

Commit 05827b5d authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Null check inside filterIfNotSystemUser" into tm-dev am: fb8919fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17058191

Change-Id: I023d2dd9af27dd5f865b953a2f497f7e91635977
parents bb60061a fb8919fa

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);