diff options
| author | Billy Lau <billylau@google.com> | 2015-07-13 23:00:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:00:54 +0000 |
| commit | f028ba3db3d3b6478154952dbbd8ed7422ad14f6 (patch) | |
| tree | adeb2a01c14bf84bb79d36575063074a9c8da063 /services | |
| parent | a9fc8aa3c88e7b837be65abf6f3b0f3e2e9a4a1e (diff) | |
| parent | 96d00ab359d60197321f06b4feb3d01f3fa03a29 (diff) | |
| download | frameworks_base-f028ba3db3d3b6478154952dbbd8ed7422ad14f6.zip frameworks_base-f028ba3db3d3b6478154952dbbd8ed7422ad14f6.tar.gz frameworks_base-f028ba3db3d3b6478154952dbbd8ed7422ad14f6.tar.bz2 | |
am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '96d00ab359d60197321f06b4feb3d01f3fa03a29':
Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index 8e3334f..7a74729 100644 --- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java @@ -262,7 +262,6 @@ final class DefaultPermissionGrantPolicy { && doesPackageSupportRuntimePermissions(setupPackage)) { grantRuntimePermissionsLPw(setupPackage, PHONE_PERMISSIONS, userId); grantRuntimePermissionsLPw(setupPackage, CONTACTS_PERMISSIONS, userId); - grantRuntimePermissionsLPw(setupPackage, SETTINGS_PERMISSIONS, userId); } // Camera |