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

Commit bc1ca0d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unhide MAKE_USER_EPHEMERAL"

parents 77ef9c3c 6badae67

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6541,6 +6541,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
@@ -6788,6 +6788,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
@@ -6615,6 +6615,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
@@ -6097,8 +6097,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;