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

Merge "Add SUPPORTED_MODES_DEVICE_OWNER to force DO provisioning"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-11 22:56:22 +00:00
committed by Android (Google) Code Review
parent f0243ed0ee b57474fe7c
commit 3019485370
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -906,6 +906,7 @@ package android.app.admin {
field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3
field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1
field public static final int STATE_USER_UNMANAGED = 0; // 0x0
field public static final int SUPPORTED_MODES_DEVICE_OWNER = 4; // 0x4
field public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3; // 0x3
field public static final int SUPPORTED_MODES_ORGANIZATION_OWNED = 1; // 0x1
field public static final int SUPPORTED_MODES_PERSONALLY_OWNED = 2; // 0x2

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

@@ -1257,7 +1257,8 @@ public class DevicePolicyManager {
@IntDef(prefix = { "SUPPORTED_MODES_" }, value = {
SUPPORTED_MODES_ORGANIZATION_OWNED,
SUPPORTED_MODES_PERSONALLY_OWNED,
SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED
SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED,
SUPPORTED_MODES_DEVICE_OWNER
})
@Retention(RetentionPolicy.SOURCE)
public @interface ProvisioningConfiguration {}
@@ -1383,6 +1384,15 @@ public class DevicePolicyManager {
@SystemApi
public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3;
/**
* A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that the only supported
* provisioning mode is device owner.
*
* @hide
*/
@SystemApi
public static final int SUPPORTED_MODES_DEVICE_OWNER = 4;
/**
* This MIME type is used for starting the device owner provisioning.
*
@@ -2519,6 +2529,7 @@ public class DevicePolicyManager {
* @see #SUPPORTED_MODES_ORGANIZATION_OWNED
* @see #SUPPORTED_MODES_PERSONALLY_OWNED
* @see #SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED
* @see #SUPPORTED_MODES_DEVICE_OWNER
* @hide
*/
@SystemApi