diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-09-03 18:14:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 18:14:17 +0000 |
| commit | a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb (patch) | |
| tree | 22d2c8ad2dd1bacef65782c3e560a2d0b2f9450e | |
| parent | 1942f8a72dbbd6e436c4744bdfa8c79a7d6aae4d (diff) | |
| parent | 0b5162c85f01f8451120e7ad82aa7193850862f7 (diff) | |
| download | frameworks_base-a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb.zip frameworks_base-a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb.tar.gz frameworks_base-a5cd5d8756bbaa62f965489f6fe9cd52e3fd17eb.tar.bz2 | |
am 0b5162c8: am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '0b5162c85f01f8451120e7ad82aa7193850862f7':
Don't drop runtime permissions on older system app update.
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 886c100..96c5460 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -5933,12 +5933,6 @@ public class PackageManagerService extends IPackageManager.Stub { */ if (shouldHideSystemApp) { synchronized (mPackages) { - /* - * We have to grant systems permissions before we hide, because - * grantPermissions will assume the package update is trying to - * expand its permissions. - */ - grantPermissionsLPw(pkg, true, pkg.packageName); mSettings.disableSystemPackageLPw(pkg.packageName); } } |