commit df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c
author Suchi Amalapurapu <asuchitra@google.com> Wed May 05 17:38:58 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 05 17:38:58 2010 -0700
tree 609e257f6ed24a2ef3e413cd8150873e166a2f33
parent 2d315667ab733375d8c696f8c2f155bc1de9e4a2
parent c1d07d9bebe487f8881f51f989a299b3c3c6d4fa

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

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 ba326d6..b9204c7 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5780,6 +5780,18 @@
                 }
                 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);
+                }
+            }
         }
     }