diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-16 22:23:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-16 22:23:38 +0000 |
| commit | c00e49b6e4e4cc8356529567040d6ee3be8c1dc3 (patch) | |
| tree | 58984c658ceed70c06f9017c900055be9493138f /packages/Shell | |
| parent | 7b0fa466b59002342d14030aafb7e2f9473ca14d (diff) | |
| parent | d4b566bf56333de708908ce4accb5fb067be64f0 (diff) | |
| download | frameworks_base-c00e49b6e4e4cc8356529567040d6ee3be8c1dc3.zip frameworks_base-c00e49b6e4e4cc8356529567040d6ee3be8c1dc3.tar.gz frameworks_base-c00e49b6e4e4cc8356529567040d6ee3be8c1dc3.tar.bz2 | |
am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
Add APIs for verifier to grant at install and revoke permissions
Diffstat (limited to 'packages/Shell')
| -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" /> |