drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of b0903104 to master

Browse Source 
Change-Id: Iff20980c44d42b41ae411c4201e0927cee19d415
This commit is contained in:
Kenny Root
2010-01-28 12:03:49 -08:00
parent 5f551ef6a8 b0903104fd
commit bdbc925a27
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,20 +731,32 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
void cleanupInstallFailedPackage(PackageSetting pkgSettings) {
void cleanupInstallFailedPackage(PackageSetting ps) {
Log.i(TAG, "Cleaning up incompletely installed app: " + ps.name);
if (mInstaller != null) {
boolean useSecureFS = useEncryptedFilesystemForPackage(pkgSettings.pkg);
int retCode = mInstaller.remove(pkgSettings.name, useSecureFS);
boolean useSecureFS = useEncryptedFilesystemForPackage(ps.pkg);
int retCode = mInstaller.remove(ps.name, useSecureFS);
if (retCode < 0) {
Log.w(TAG, "Couldn't remove app data directory for package: "
+ pkgSettings.name + ", retcode=" + retCode);
+ ps.name + ", retcode=" + retCode);
}
} else {
//for emulator
File dataDir = new File(pkgSettings.pkg.applicationInfo.dataDir);
PackageParser.Package pkg = mPackages.get(ps.name);
File dataDir = new File(pkg.applicationInfo.dataDir);
dataDir.delete();
}
mSettings.removePackageLP(pkgSettings.name);
if (ps.codePath != null) {
if (!ps.codePath.delete()) {
Log.w(TAG, "Unable to remove old code file: " + ps.codePath);
}
}
if (ps.resourcePath != null) {
if (!ps.resourcePath.delete() && !ps.resourcePath.equals(ps.codePath)) {
Log.w(TAG, "Unable to remove old code file: " + ps.resourcePath);
}
}
mSettings.removePackageLP(ps.name);
}
void readPermissions() {