diff options
| author | Nick Kralevich <nnk@google.com> | 2013-03-19 23:22:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-19 23:22:58 +0000 |
| commit | c4546ea0caa1ce147c435a6ac4a2d3f1ff6568ad (patch) | |
| tree | 9e8e093266c6b7909e0b757eade21682b7a9ca80 | |
| parent | 48fac918903e23a82dbe02297b3fbac4106d8cbf (diff) | |
| parent | 813a4bd48de33efe5c882ad3b9258e88d6d10fd7 (diff) | |
| download | android_packages_apps_PackageInstaller-c4546ea0caa1ce147c435a6ac4a2d3f1ff6568ad.tar.gz android_packages_apps_PackageInstaller-c4546ea0caa1ce147c435a6ac4a2d3f1ff6568ad.tar.bz2 android_packages_apps_PackageInstaller-c4546ea0caa1ce147c435a6ac4a2d3f1ff6568ad.zip | |
am 813a4bd4: PackageUtil: don\'t collect certs if package doesn\'t exist
* commit '813a4bd48de33efe5c882ad3b9258e88d6d10fd7':
PackageUtil: don't collect certs if package doesn't exist
| -rw-r--r-- | src/com/android/packageinstaller/PackageUtil.java | 9 |
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; } |