diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
commit | f587ad6fd760c78eae8fe7a59104f43a7ea84f3d (patch) | |
tree | 1c8f9d691d69b893902c7c2d467a3df0555b2615 /src/com/android/packageinstaller/PackageUtil.java | |
parent | a4b300d057b74e848de622c33c2206281d0df631 (diff) | |
parent | b1a5960af6814e38ae7dcd771d25c1d8ab1dcae6 (diff) | |
download | android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.gz android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.bz2 android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.zip |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-nl/strings.xml
Change-Id: I6b4a88abd08a4a2f2cecbc4ea5b86bbc736d2dd6
Diffstat (limited to 'src/com/android/packageinstaller/PackageUtil.java')
-rw-r--r-- | src/com/android/packageinstaller/PackageUtil.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java index 8681bfc7..650e7fb1 100644 --- a/src/com/android/packageinstaller/PackageUtil.java +++ b/src/com/android/packageinstaller/PackageUtil.java @@ -72,8 +72,12 @@ public class PackageUtil { metrics.setToDefaults(); PackageParser.Package pkg = packageParser.parsePackage(sourceFile, archiveFilePath, metrics, 0); - // Nuke the parser reference. - packageParser = null; + if (pkg == null) { + return null; + } + if (!packageParser.collectManifestDigest(pkg)) { + return null; + } return pkg; } |