commit f0580888883db5be6654121e15455b76badc5b81
author Dianne Hackborn <hackbod@google.com> Thu Jul 29 14:17:30 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 29 14:17:30 2010 -0700
tree 3ad3096742749cdef15f4611eb680e35605556c0
parent 1fdacef18d6491eab1b76e75bb315bb075a01a18
parent 52075987c5726c95613f98571aac4c54e8319df4

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. :(

services/java/com/android/server/PackageManagerService.java

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 @@
                 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);