Merge from open-source froyo

The Android Open Source Project · The Android Open Source Project · commit 392edec1162e · 2010-07-29T15:38:49.000-07:00
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
@@ -6222,11 +6222,10 @@ private void removePackageDataLI(PackageParser.Package p, PackageRemovedInfo out
                 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);

Original file line number	Diff line number	Diff line change
`@@ -6222,11 +6222,10 @@ private void removePackageDataLI(PackageParser.Package p, PackageRemovedInfo out`
`6222`	`6222`	`File dataDir = new File(pkg.applicationInfo.dataDir);`
`6223`	`6223`	`dataDir.delete();`
`6224`	`6224`	`}`
	`6225`	`+ schedulePackageCleaning(packageName);`
`6225`	`6226`	`}`
`6226`	`6227`	`synchronized (mPackages) {`
`6227`	`6228`	`if (deletedPs != null) {`
`6228`		`- schedulePackageCleaning(packageName);`
`6229`		`-`
`6230`	`6229`	`if ((flags&PackageManager.DONT_DELETE_DATA) == 0) {`
`6231`	`6230`	`if (outInfo != null) {`
`6232`	`6231`	`outInfo.removedUid = mSettings.removePackageLP(packageName);`