diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-20 11:33:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-20 11:33:27 -0800 |
| commit | c1ff9b325562dfda88ba7d2ef1a763471d389377 (patch) | |
| tree | 4966f7ba9a746c6fd63344cbe96c330f04ab2b50 /services | |
| parent | 635b2b77b917c1bf20ce135ce6fcc98a6a7be084 (diff) | |
| parent | d485c76b5e09a8c311f8f129cbe5ec75499556be (diff) | |
| download | frameworks_base-c1ff9b325562dfda88ba7d2ef1a763471d389377.zip frameworks_base-c1ff9b325562dfda88ba7d2ef1a763471d389377.tar.gz frameworks_base-c1ff9b325562dfda88ba7d2ef1a763471d389377.tar.bz2 | |
am d485c76b: am c8e8a12b: Merge "Fix issue #3289835: NullPointerException in..." into gingerbread
* commit 'd485c76b5e09a8c311f8f129cbe5ec75499556be':
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 2691e1d..7965dda 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -5774,7 +5774,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; |