Merge "Fix issue #3289835: NullPointerException in..." into gingerbread

2010-12-17 10:37:25 -08:00
parent a936b256eb 3ec27e06a7
commit c8e8a12b3c
1 changed files with 4 additions and 1 deletions
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@ -5699,7 +5699,10 @@ class PackageManagerService extends IPackageManager.Stub {
        res.removedInfo.removedPackage = packageName;
        // Remove existing system package
        removePackageLI(oldPkg, true);
-
+        synchronized (mPackages) {
+            mSettings.disableSystemPackageLP(packageName);
+        }
+        
        // Successfully disabled the old package. Now proceed with re-installation
        mLastScanError = PackageManager.INSTALL_SUCCEEDED;
        pkg.applicationInfo.flags |= ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;