diff options
| author | Billy Lau <billylau@google.com> | 2015-07-12 22:02:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-12 22:02:37 +0000 |
| commit | 96d00ab359d60197321f06b4feb3d01f3fa03a29 (patch) | |
| tree | 3e6ed46d2e4b17a1c6a85f54d37394351f92ab27 /services/core/java | |
| parent | 4fb81253edc726936d4b71b7e9c0789cab45e9da (diff) | |
| parent | 22b3f4cb15207239e203d5ec8b72ec6bc90fef35 (diff) | |
| download | frameworks_base-96d00ab359d60197321f06b4feb3d01f3fa03a29.zip frameworks_base-96d00ab359d60197321f06b4feb3d01f3fa03a29.tar.gz frameworks_base-96d00ab359d60197321f06b4feb3d01f3fa03a29.tar.bz2 | |
Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
Diffstat (limited to 'services/core/java')
| -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 |