PackageUtil: don't collect certs if package doesn't exist

If packageParser.parsePackage() returns null, don't attempt call
packageParser.collectCertificates().

This fixes a NPE triggered by the following command:

am start -a android.intent.action.VIEW -d file:///blah/blah.apk -t application/vnd.android.package-archive

Change-Id: I6f6f836734d4b4ee07e98ee6b1f6339fa675b8b0

1 files changed, 6 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java
index 20dce430..5263b71c 100644
--- a/src/com/android/packageinstaller/PackageUtil.java
+++ b/src/com/android/packageinstaller/PackageUtil.java
@@ -72,9 +72,12 @@ public class PackageUtil {
         metrics.setToDefaults();
         PackageParser.Package pkg =  packageParser.parsePackage(sourceFile,
                 archiveFilePath, metrics, 0);
-        packageParser.collectCertificates(pkg, 0);
-        // Nuke the parser reference.
-        packageParser = null;
+        if (pkg == null) {
+            return null;
+        }
+        if (!packageParser.collectCertificates(pkg, 0)) {
+            return null;
+        }
         return pkg;
     }