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

Commit 8de5748e authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by Android (Google) Code Review
Browse files

Merge "pm: Modify getPackage() to only return non-null packages"

parents 095d7cc5 b6c042f4

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ public final class SharedUserSetting extends SettingBase { 
        }

        }

        final ArrayList<PackageParser.Package> pkgList = new ArrayList<>(packages.size());

        final ArrayList<PackageParser.Package> pkgList = new ArrayList<>(packages.size());

        for (PackageSetting ps : packages) {

        for (PackageSetting ps : packages) {

            if (ps == null) {

            if ((ps == null) || (ps.pkg == null)) {

                continue;

                continue;

            }

            }

            pkgList.add(ps.pkg);

            pkgList.add(ps.pkg);