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

Commit 331544c5 authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by android-build-merger
Browse files

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

am: b1464cd4

Change-Id: I8b071e4d053ba61485fa853906d73c957570f5f3
parents 63ac5a77 b1464cd4

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

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

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

        for (PackageSetting ps : packages) {

            if (ps == null) {

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

                continue;

            }

            pkgList.add(ps.pkg);