Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow apps with CREATE_USERS permission to create demo users. am: 234d1afd79

Browse Source 
am: 0be41fc1a9

Change-Id: I9da0eedb106d61c7041df78d0b287e6f28fe3069
This commit is contained in:
Sudheer Shanka
2016-08-30 18:05:51 +00:00
committed by android-build-merger
parent 6d1a48ba3f 0be41fc1a9
commit ad520f877f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
View File

@@ -1639,7 +1639,7 @@
<!-- @hide Allows an application to create, remove users and get the list of <!-- @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, users on the device. Applications holding this permission can only create restricted,
guest, managed, and ephemeral users. For creating other kind of users, guest, managed, demo, and ephemeral users. For creating other kind of users,
{@link android.Manifest.permission#MANAGE_USERS} is needed. {@link android.Manifest.permission#MANAGE_USERS} is needed.
This permission is not available to third party applications. --> This permission is not available to third party applications. -->
<permission android:name="android.permission.CREATE_USERS" <permission android:name="android.permission.CREATE_USERS"

3
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -180,7 +180,8 @@ public class UserManagerService extends IUserManager.Stub {
UserInfo.FLAG_MANAGED_PROFILE UserInfo.FLAG_MANAGED_PROFILE
| UserInfo.FLAG_EPHEMERAL | UserInfo.FLAG_EPHEMERAL
| UserInfo.FLAG_RESTRICTED | UserInfo.FLAG_RESTRICTED
| UserInfo.FLAG_GUEST; | UserInfo.FLAG_GUEST
| UserInfo.FLAG_DEMO;
private static final int MIN_USER_ID = 10; private static final int MIN_USER_ID = 10;
// We need to keep process uid within Integer.MAX_VALUE. // We need to keep process uid within Integer.MAX_VALUE.