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

* commit 'c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579': Fix issue #3289835: NullPointerException in...
2010-12-20 11:30:07 -08:00
parent d90bc225b9 c8e8a12b3c
commit d485c76b5e
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;