commit 51ff575d1bd0337a68ae173ee699ff8298ddb703
author Dianne Hackborn <hackbod@google.com> Wed Jan 23 22:45:51 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 23 22:46:01 2013 +0000
tree 0e423b22a15483c44dcc7800860c855d1cbc61b1
parent 846dda3fa7a194b57acdb977e443c93c7cddcea1
parent c4d27a7d55760d7897352906abe1e2c579283f5e

Merge "Fix issue #7649720: ANR occur when OTA with lower version..."

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

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 5462ecc..b893062 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -3297,6 +3297,13 @@
                     Log.i(TAG, "Package " + ps.name + " at " + scanFile
                             + " ignored: updated version " + ps.versionCode
                             + " better than this " + pkg.mVersionCode);
+                    if (!updatedPkg.codePath.equals(scanFile)) {
+                        Slog.w(PackageManagerService.TAG, "Code path for hidden system pkg : "
+                                + ps.name + " changing from " + updatedPkg.codePathString
+                                + " to " + scanFile);
+                        updatedPkg.codePath = scanFile;
+                        updatedPkg.codePathString = scanFile.toString();                        
+                    }
                     mLastScanError = PackageManager.INSTALL_FAILED_DUPLICATE_PACKAGE;
                     return null;
                 } else {