diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:09:55 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:43 -0700 |
| commit | cacdaa4aeedc6b0817eba92a83b8e5edfe27f637 (patch) | |
| tree | f12313a55eeaa75f4faff3e1d134dc349420f094 /core/res | |
| parent | 1ab48a3666118e40cf56142c886a7217b92d0d4a (diff) | |
| parent | 4e4743a354e26467318b437892a9980eb9b8328a (diff) | |
| download | frameworks_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 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ea0e39c..1cf7ec9 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1415,6 +1415,14 @@ <permission android:name="android.permission.MANAGE_USERS" android:protectionLevel="signature|privileged" /> + <!-- @hide Allows an application to create, remove users and get the list of + users on the device. Applications holding this permission can only create restricted, + guest, and managed users. For creating other kind of users, + {@link android.Manifest.permission#MANAGE_USERS} is needed. + This permission is not available to third party applications. --> + <permission android:name="android.permission.CREATE_USERS" + android:protectionLevel="signature" /> + <!-- @hide Allows an application to set the profile owners and the device owner. This permission is not available to third party applications.--> <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" |