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

This commit is contained in:
Dianne Hackborn
2010-12-17 10:37:25 -08:00
committed by Android (Google) Code Review

View File

@ -5699,6 +5699,9 @@ class PackageManagerService extends IPackageManager.Stub {
res.removedInfo.removedPackage = packageName; res.removedInfo.removedPackage = packageName;
// Remove existing system package // Remove existing system package
removePackageLI(oldPkg, true); removePackageLI(oldPkg, true);
synchronized (mPackages) {
mSettings.disableSystemPackageLP(packageName);
}
// Successfully disabled the old package. Now proceed with re-installation // Successfully disabled the old package. Now proceed with re-installation
mLastScanError = PackageManager.INSTALL_SUCCEEDED; mLastScanError = PackageManager.INSTALL_SUCCEEDED;