summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-07-24 22:03:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-24 22:03:33 -0700
commitb497a819b78cca9cc7e7cc115a7a366fd192f6f0 (patch)
tree30474cfeacf95083807532d898d8e28ecb20c44b /data
parent576238a33131829e60a751774c9baabf4a466706 (diff)
parentf52dcf32f2fba7c89bbd127c22f2ee2b933915c6 (diff)
downloadframeworks_base-b497a819b78cca9cc7e7cc115a7a366fd192f6f0.zip
frameworks_base-b497a819b78cca9cc7e7cc115a7a366fd192f6f0.tar.gz
frameworks_base-b497a819b78cca9cc7e7cc115a7a366fd192f6f0.tar.bz2
am f52dcf32: am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev
* commit 'f52dcf32f2fba7c89bbd127c22f2ee2b933915c6': Fix issue #6860828 Non-root shell can't grant permissions
Diffstat (limited to 'data')
-rw-r--r--data/etc/platform.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 38a75b6..1b69daf 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -167,6 +167,12 @@
<assign-permission name="android.permission.FORCE_STOP_PACKAGES" uid="shell" />
<assign-permission name="android.permission.STOP_APP_SWITCHES" uid="shell" />
<assign-permission name="android.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY" uid="shell" />
+ <assign-permission name="android.permission.GRANT_REVOKE_PERMISSIONS" uid="shell" />
+ <assign-permission name="android.permission.SET_KEYBOARD_LAYOUT" uid="shell" />
+ <assign-permission name="android.permission.GET_DETAILED_TASKS" uid="shell" />
+ <assign-permission name="android.permission.SET_SCREEN_COMPATIBILITY" uid="shell" />
+ <assign-permission name="android.permission.READ_EXTERNAL_STORAGE" uid="shell" />
+ <assign-permission name="android.permission.WRITE_EXTERNAL_STORAGE" uid="shell" />
<assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />
<assign-permission name="android.permission.ACCESS_DRM" uid="media" />