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

2018-03-08 08:27:44 +00:00
parent 7184e28b3a 0a4c63f958
commit b1464cd4f8
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/SharedUserSetting.java
+++ b/services/core/java/com/android/server/pm/SharedUserSetting.java
@@ -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);