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

am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491

Browse Source 
Merge commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7' into eclair-plus-aosp

* commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7':
  cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
This commit is contained in:
android-build SharedAccount
2010-02-16 12:53:04 -08:00
committed by Android Git Automerger
parent 58d6a20cfa 5d72a8dda2
commit f8bb2a9ad0
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1977,12 +1977,6 @@ 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();
}
} }
} }
@@ -2177,13 +2171,6 @@ 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;