diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-29 18:00:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 18:00:01 +0000 |
| commit | 9e3d8e269e1c016af28c29ca8989ba765504331d (patch) | |
| tree | 2f669a420641a9057fd0f5cfbf1aaf1aa2515808 /services | |
| parent | 7b45b0fbf14c43521560a7bf115ec5c92cda1788 (diff) | |
| parent | a7a65ee4c5fb879fee258c63b92e49ab4571bbdb (diff) | |
| download | frameworks_base-9e3d8e269e1c016af28c29ca8989ba765504331d.zip frameworks_base-9e3d8e269e1c016af28c29ca8989ba765504331d.tar.gz frameworks_base-9e3d8e269e1c016af28c29ca8989ba765504331d.tar.bz2 | |
am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev
* commit 'a7a65ee4c5fb879fee258c63b92e49ab4571bbdb':
Allow non system to set perm policy flags - needed by the installer
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 513e7b1..497651a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3628,8 +3628,6 @@ public class PackageManagerService extends IPackageManager.Stub { if (getCallingUid() != Process.SYSTEM_UID) { flagMask &= ~PackageManager.FLAG_PERMISSION_SYSTEM_FIXED; flagValues &= ~PackageManager.FLAG_PERMISSION_SYSTEM_FIXED; - flagMask &= ~PackageManager.FLAG_PERMISSION_POLICY_FIXED; - flagValues &= ~PackageManager.FLAG_PERMISSION_POLICY_FIXED; flagMask &= ~PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT; flagValues &= ~PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT; } |