diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-16 22:50:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-16 22:50:23 +0000 |
| commit | 475858c34d21b38d9be4356a7fc654eb879e34b5 (patch) | |
| tree | bf24f8fd330da87632e2e467c7f4d527e0afaaab /packages | |
| parent | 4c93506881fa710d69557a592f3fc7759b3ec9c4 (diff) | |
| parent | b295963baebac1b70ca701a50c77a83659963608 (diff) | |
| download | frameworks_base-475858c34d21b38d9be4356a7fc654eb879e34b5.zip frameworks_base-475858c34d21b38d9be4356a7fc654eb879e34b5.tar.gz frameworks_base-475858c34d21b38d9be4356a7fc654eb879e34b5.tar.bz2 | |
am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
* commit 'b295963baebac1b70ca701a50c77a83659963608':
Add APIs for verifier to grant at install and revoke permissions
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 9832b45..c00fdf3 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -76,7 +76,9 @@ <uses-permission android:name="android.permission.FORCE_STOP_PACKAGES" /> <uses-permission android:name="android.permission.STOP_APP_SWITCHES" /> <uses-permission android:name="android.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY" /> - <uses-permission android:name="android.permission.GRANT_REVOKE_PERMISSIONS" /> + <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" /> + <uses-permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS" /> + <uses-permission android:name="android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS" /> <uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" /> <uses-permission android:name="android.permission.GET_DETAILED_TASKS" /> <uses-permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" /> |