summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:09:55 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:37:43 -0700
commitcacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch)
treef12313a55eeaa75f4faff3e1d134dc349420f094 /packages/Shell
parent1ab48a3666118e40cf56142c886a7217b92d0d4a (diff)
parent4e4743a354e26467318b437892a9980eb9b8328a (diff)
downloadframeworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.zip
frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.gz
frameworks_base-cacdaa4aeedc6b0817eba92a83b8e5edfe27f637.tar.bz2
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ib003ccb606e0d77209291b757ea36399d3b65814
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 3c90414..61504b3 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -91,7 +91,7 @@
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
<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.CREATE_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" />