Allow apps with CREATE_USERS permission to create demo users. am: 234d1afd79
am: 0be41fc1a9
Change-Id: I9da0eedb106d61c7041df78d0b287e6f28fe3069
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e17a80d..1dc32a2 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1639,7 +1639,7 @@
<!-- @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, 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.
This permission is not available to third party applications. -->
<permission android:name="android.permission.CREATE_USERS"
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 0ac8407..0a385f3 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -180,7 +180,8 @@
UserInfo.FLAG_MANAGED_PROFILE
| UserInfo.FLAG_EPHEMERAL
| UserInfo.FLAG_RESTRICTED
- | UserInfo.FLAG_GUEST;
+ | UserInfo.FLAG_GUEST
+ | UserInfo.FLAG_DEMO;
private static final int MIN_USER_ID = 10;
// We need to keep process uid within Integer.MAX_VALUE.