Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.

Browse Source 
Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp

* commit '08be55b8ea917a5273c135a7bdc73e41c8524c05':
  Add null checks when scanning a package.
This commit is contained in:
Suchi Amalapurapu
2010-02-08 17:27:33 -08:00
committed by Android Git Automerger
parent ad9bcb22d0 08be55b8ea
commit 37a00a36fb
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/PackageManagerService.java
View File

@@ -1977,6 +1977,12 @@ class PackageManagerService extends IPackageManager.Stub {
} }
PackageParser.Package pkg = scanPackageLI(file, file, resFile, PackageParser.Package pkg = scanPackageLI(file, file, resFile,
flags|PackageParser.PARSE_MUST_BE_APK, scanMode); flags|PackageParser.PARSE_MUST_BE_APK, scanMode);
// Don't mess around with apps in system partition.
if (pkg == null && (flags & PackageParser.PARSE_IS_SYSTEM) == 0) {
// Delete the apk
Log.w(TAG, "Cleaning up failed install of " + file);
file.delete();
}
} }
} }
@@ -2171,6 +2177,13 @@ class PackageManagerService extends IPackageManager.Stub {
File scanFile, File destCodeFile, File destResourceFile, File scanFile, File destCodeFile, File destResourceFile,
PackageParser.Package pkg, int parseFlags, int scanMode) { PackageParser.Package pkg, int parseFlags, int scanMode) {
if (scanFile == null || destCodeFile == null ||
destResourceFile == null) {
// Bail out. The resource and code paths haven't been set.
Log.w(TAG, " Code and resource paths haven't been set correctly");
mLastScanError = PackageManager.INSTALL_FAILED_INVALID_APK;
return null;
}
mScanningPath = scanFile; mScanningPath = scanFile;
if (pkg == null) { if (pkg == null) {
mLastScanError = PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME; mLastScanError = PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME;