commit 4347321e35324f308e95257940781c43bc64c37a
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 02:07:59 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 02:07:59 2018 -0700
tree 55d3086ff2e4f3a6fdbd5526c2136127f6f57747
parent 81e5fce398a8d73e3715297d2bbbefdd76acb84c
parent dc4d184e1570d74f7c7cf2cbb26f0904e4618ded

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

Change-Id: Id5bd7fdd238482ad0265feac78636adaf4e2a1fb

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 72d1722..ad0ca6e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22477,9 +22477,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);