diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-16 12:41:56 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-12-16 12:41:56 -0800 |
| commit | 3ec27e06a763f664b992cf1f9d8b378ea3fb53f5 (patch) | |
| tree | c7df5df3239d317e4c7d9bc3f64c35db92d8aab0 /services/java | |
| parent | 2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704 (diff) | |
| download | frameworks_base-3ec27e06a763f664b992cf1f9d8b378ea3fb53f5.zip frameworks_base-3ec27e06a763f664b992cf1f9d8b378ea3fb53f5.tar.gz frameworks_base-3ec27e06a763f664b992cf1f9d8b378ea3fb53f5.tar.bz2 | |
Fix issue #3289835: NullPointerException in...
..PackageManagerService.grantPermissionsLP when updating system app
Change-Id: I36c1b96d2fe9a8737843d30f3a2669935fc281bb
Diffstat (limited to 'services/java')
| -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; |