am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo

Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp

* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
  Fix 2656989. Clean up update to updated system applications.

1 files changed, 12 insertions, 0 deletions

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 6aa1cbf..36c07e3 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5780,6 +5780,18 @@ class PackageManagerService extends IPackageManager.Stub {
                 }
                 mSettings.writeLP();
             }
+        } else {
+            // If this is an update to an existing update, setup 
+            // to remove the existing update.
+            synchronized (mPackages) {
+                PackageSetting ps = mSettings.getDisabledSystemPkg(packageName);
+                if (ps != null && ps.codePathString != null &&
+                        !ps.codePathString.equals(oldPkgSetting.codePathString)) {
+                    int installFlags = 0;
+                    res.removedInfo.args = createInstallArgs(0, oldPkgSetting.codePathString,
+                            oldPkgSetting.resourcePathString);
+                }
+            }
         }
     }