From b6c042f4bb65cf322151e50a3090e4b1f6304b2a Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Tue, 6 Mar 2018 13:28:29 -0800
Subject: [PATCH] pm: Modify getPackage() to only return non-null packages

Bug: 74214574
Test: successfully flash and boot from build 4504078 to ToT master
Change-Id: I458db34a441dabed3cad7bd8fc9769bad49b3b30
---
 services/core/java/com/android/server/pm/SharedUserSetting.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/SharedUserSetting.java b/services/core/java/com/android/server/pm/SharedUserSetting.java
index 244613180d007..ed396c3194622 100644
--- a/services/core/java/com/android/server/pm/SharedUserSetting.java
+++ b/services/core/java/com/android/server/pm/SharedUserSetting.java
@@ -96,7 +96,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);