diff options
| author | Esteban Talavera <etalavera@google.com> | 2014-09-15 18:42:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-15 18:42:30 +0000 |
| commit | 895e08adcd36e411934d0713dd8e5fa1ab9f6ab7 (patch) | |
| tree | eb8c8fde43d6026726fcbd0429b5196c63728d2c /packages | |
| parent | 08ff5c14feb2aee0027eabcbb9a5e7390658a84d (diff) | |
| parent | 9c17388cff98fba9679ce6457ac5003a660c6013 (diff) | |
| download | frameworks_base-895e08adcd36e411934d0713dd8e5fa1ab9f6ab7.zip frameworks_base-895e08adcd36e411934d0713dd8e5fa1ab9f6ab7.tar.gz frameworks_base-895e08adcd36e411934d0713dd8e5fa1ab9f6ab7.tar.bz2 | |
Merge "Set device admin on dpm set-device-owner command" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index f1d2bee..9f9dc23 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -85,6 +85,7 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> + <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.BLUETOOTH_STACK" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.RETRIEVE_WINDOW_TOKEN" /> |