Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6badae67 authored by Alex Chau's avatar Alex Chau
Browse files

Unhide MAKE_USER_EPHEMERAL 

- Added javadoc to explain what is ephemeral user

Bug: 64381943
Test: Create ephemeral user with createAndManageUser and verify user is removed after switching or reboot
Test: CTS is covered in ag/2789603
Change-Id: Ia69459520b39de0903433cfa5431529957bb4d82
parent 26b78bc9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6539,6 +6539,7 @@ package android.app.admin { 
    field public static final int LOCK_TASK_FEATURE_NOTIFICATIONS = 2; // 0x2

    field public static final int LOCK_TASK_FEATURE_RECENTS = 8; // 0x8

    field public static final int LOCK_TASK_FEATURE_SYSTEM_INFO = 1; // 0x1

    field public static final int MAKE_USER_EPHEMERAL = 2; // 0x2

    field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning";

    field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000

    field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6785,6 +6785,7 @@ package android.app.admin { 
    field public static final int LOCK_TASK_FEATURE_NOTIFICATIONS = 2; // 0x2

    field public static final int LOCK_TASK_FEATURE_RECENTS = 8; // 0x8

    field public static final int LOCK_TASK_FEATURE_SYSTEM_INFO = 1; // 0x1

    field public static final int MAKE_USER_EPHEMERAL = 2; // 0x2

    field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning";

    field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000

    field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6610,6 +6610,7 @@ package android.app.admin { 
    field public static final int LOCK_TASK_FEATURE_NOTIFICATIONS = 2; // 0x2

    field public static final int LOCK_TASK_FEATURE_RECENTS = 8; // 0x8

    field public static final int LOCK_TASK_FEATURE_SYSTEM_INFO = 1; // 0x1

    field public static final int MAKE_USER_EPHEMERAL = 2; // 0x2

    field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning";

    field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000

    field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -6096,8 +6096,8 @@ public class DevicePolicyManager { 


    /**

     * Flag used by {@link #createAndManageUser} to specify that the user should be created

     * ephemeral.

     * @hide

     * ephemeral. Ephemeral users will be removed after switching to another user or rebooting the

     * device.

     */

    public static final int MAKE_USER_EPHEMERAL = 0x0002;