am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread

Merge commit '31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp

* commit '31b5d5485f7336639d252da7ba979234dbd2f1e1':
  Fix a bug where we cleaned an apps external data when upgrading it. :(
This commit is contained in:
Dianne Hackborn
2010-07-29 14:12:17 -07:00
committed by Android Git Automerger

View File

@@ -6282,11 +6282,10 @@ class PackageManagerService extends IPackageManager.Stub {
File dataDir = new File(pkg.applicationInfo.dataDir); File dataDir = new File(pkg.applicationInfo.dataDir);
dataDir.delete(); dataDir.delete();
} }
schedulePackageCleaning(packageName);
} }
synchronized (mPackages) { synchronized (mPackages) {
if (deletedPs != null) { if (deletedPs != null) {
schedulePackageCleaning(packageName);
if ((flags&PackageManager.DONT_DELETE_DATA) == 0) { if ((flags&PackageManager.DONT_DELETE_DATA) == 0) {
if (outInfo != null) { if (outInfo != null) {
outInfo.removedUid = mSettings.removePackageLP(packageName); outInfo.removedUid = mSettings.removePackageLP(packageName);