commit dc4d184e1570d74f7c7cf2cbb26f0904e4618ded
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 01:57:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 01:57:08 2018 -0700
tree 6f5726e91429208ed6a4fc2e6fa8028ea6a74b59
parent cd2d6d909543196844cd8365be59383425f2804f
parent e4d1cabe457d1e5435377015d5511520ca582a87

Merge "Fix an NPE in PackageManagerService (introduced by ag/3819668)" into pi-dev
am: e4d1cabe45

Change-Id: I8281c6aa2f84f6b0401e1c14cc0d027312101db4

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5873f57..56a6502 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22473,9 +22473,13 @@
         }
         final String volumeUuid = pkg.volumeUuid;
         final String packageName = pkg.packageName;
-        final ApplicationInfo app = (ps == null)
+
+        ApplicationInfo app = (ps == null)
                 ? pkg.applicationInfo
                 : PackageParser.generateApplicationInfo(pkg, 0, ps.readUserState(userId), userId);
+        if (app == null) {
+            app = pkg.applicationInfo;
+        }
 
         final int appId = UserHandle.getAppId(app.uid);