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

Commit 10935c1f authored by Salud Lemus's avatar Salud Lemus Committed by Android (Google) Code Review
Browse files

Merge "Expose device owner type constants for CTS tests"

parents 1483f4d6 5ea8a1fb

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -511,6 +511,8 @@ package android.app.admin { 
    field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";

    field public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED = "android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED";

    field @Deprecated public static final int CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe

    field public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; // 0x0

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

    field public static final int OPERATION_CLEAR_APPLICATION_USER_DATA = 23; // 0x17

    field public static final int OPERATION_CREATE_AND_MANAGE_USER = 5; // 0x5

    field public static final int OPERATION_INSTALL_CA_CERT = 24; // 0x18

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

+2 −0
Original line number Diff line number Diff line
@@ -3259,6 +3259,7 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    @TestApi

    public static final int DEVICE_OWNER_TYPE_DEFAULT = 0;















    /**









@@ -3266,6 +3267,7 @@ public class DevicePolicyManager {













     *















     * @hide















     */













    @TestApi















    public static final int DEVICE_OWNER_TYPE_FINANCED = 1;





























    /**