summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2014-09-12 15:48:55 +0100
committerEsteban Talavera <etalavera@google.com>2014-09-15 11:42:34 +0100
commit9c17388cff98fba9679ce6457ac5003a660c6013 (patch)
tree4908c6381906e7298eb2a6297e7a2ba09b8570ef /packages
parent81e0c8491f22c64300182c652ac2add96888dd2e (diff)
downloadframeworks_base-9c17388cff98fba9679ce6457ac5003a660c6013.zip
frameworks_base-9c17388cff98fba9679ce6457ac5003a660c6013.tar.gz
frameworks_base-9c17388cff98fba9679ce6457ac5003a660c6013.tar.bz2
Set device admin on dpm set-device-owner command
Bug: 17312478 Change-Id: I4ef730a97d603352eda77f04a2b00fa97c2be662
Diffstat (limited to 'packages')
-rw-r--r--packages/Shell/AndroidManifest.xml1
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" />