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
This commit is contained in:
Dianne Hackborn
2012-07-24 22:03:33 -07:00
committed by Android Git Automerger

View File

@@ -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" />