Merge "Fix issue #148305913 Upon upgrading ... stuck on G logo"

2020-02-12 08:53:22 +00:00
parent 628045a49d f2c1e2d6b5
commit 65abef2f2b
1 changed files with 4 additions and 1 deletions
--- 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());
+            }
        }
    }