summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-07-29 14:17:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-29 14:17:30 -0700
commitf0580888883db5be6654121e15455b76badc5b81 (patch)
tree3ad3096742749cdef15f4611eb680e35605556c0 /services
parent1fdacef18d6491eab1b76e75bb315bb075a01a18 (diff)
parent52075987c5726c95613f98571aac4c54e8319df4 (diff)
downloadframeworks_base-f0580888883db5be6654121e15455b76badc5b81.zip
frameworks_base-f0580888883db5be6654121e15455b76badc5b81.tar.gz
frameworks_base-f0580888883db5be6654121e15455b76badc5b81.tar.bz2
am 52075987: am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread
Merge commit '52075987c5726c95613f98571aac4c54e8319df4' * commit '52075987c5726c95613f98571aac4c54e8319df4': Fix a bug where we cleaned an apps external data when upgrading it. :(
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PackageManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 34b1fc5..7279e83 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -6282,11 +6282,10 @@ class PackageManagerService extends IPackageManager.Stub {
File dataDir = new File(pkg.applicationInfo.dataDir);
dataDir.delete();
}
+ schedulePackageCleaning(packageName);
}
synchronized (mPackages) {
if (deletedPs != null) {
- schedulePackageCleaning(packageName);
-
if ((flags&PackageManager.DONT_DELETE_DATA) == 0) {
if (outInfo != null) {
outInfo.removedUid = mSettings.removePackageLP(packageName);