diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-20 11:30:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-20 11:30:07 -0800 |
| commit | d485c76b5e09a8c311f8f129cbe5ec75499556be (patch) | |
| tree | 0b4c7c9f2634653c142aa62d0e48e66a870199cc /services | |
| parent | d90bc225b9d6e4f8f69d984aa63062a7b20ac65c (diff) | |
| parent | c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579 (diff) | |
| download | frameworks_base-d485c76b5e09a8c311f8f129cbe5ec75499556be.zip frameworks_base-d485c76b5e09a8c311f8f129cbe5ec75499556be.tar.gz frameworks_base-d485c76b5e09a8c311f8f129cbe5ec75499556be.tar.bz2 | |
am c8e8a12b: Merge "Fix issue #3289835: NullPointerException in..." into gingerbread
* commit 'c8e8a12b3c649bbaf610d2ff17bb10a7b32fe579':
Fix issue #3289835: NullPointerException in...
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index be3cd75..b0f3a23 100644 --- 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; |