From f2c1e2d6b57163d0c7551b71a8be311a95b6a2f5 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 11 Feb 2020 14:36:44 -0800
Subject: [PATCH] Fix issue #148305913 Upon upgrading ... stuck on G logo

Check for null.

Bug: 148305913
Test: manually booted
Change-Id: If93c37ace6ebe114d7afc01a169848ec970fa8b6
---
 .../core/java/com/android/server/pm/SharedUserSetting.java   | 5 ++++-
 1 file changed, 4 insertions(+), 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 b9bb9e0ad0d8b..bbd319cb1c69e 100644
--- a/services/core/java/com/android/server/pm/SharedUserSetting.java
+++ b/services/core/java/com/android/server/pm/SharedUserSetting.java
@@ -182,7 +182,10 @@ public final class SharedUserSetting extends SettingBase {
     public void updateProcesses() {
         processes = null;
         for (int i = packages.size() - 1; i >= 0; i--) {
-            addProcesses(packages.valueAt(i).pkg.getProcesses());
+            final AndroidPackage pkg = packages.valueAt(i).pkg;
+            if (pkg != null) {
+                addProcesses(pkg.getProcesses());
+            }
         }
     }