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

Merge "Expose device owner type constants for CTS tests"

Browse Source
This commit is contained in:
Salud Lemus
2022-02-04 17:48:49 +00:00
committed by Android (Google) Code Review
parent 1483f4d637 5ea8a1fbe2
commit 10935c1f16
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -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

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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;
/**