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

Merge "Add extra to skip the ownership info screen"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-16 01:27:27 +00:00
committed by Android (Google) Code Review
parent 870f472ee4 f4667ef2d0
commit b8ee494bc9
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -893,6 +893,7 @@ package android.app.admin {
field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI";
field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL";
field public static final String EXTRA_PROVISIONING_ORGANIZATION_NAME = "android.app.extra.PROVISIONING_ORGANIZATION_NAME";
field public static final String EXTRA_PROVISIONING_SKIP_OWNERSHIP_DISCLAIMER = "android.app.extra.PROVISIONING_SKIP_OWNERSHIP_DISCLAIMER";
field public static final String EXTRA_PROVISIONING_SUPPORTED_MODES = "android.app.extra.PROVISIONING_SUPPORTED_MODES";
field public static final String EXTRA_PROVISIONING_SUPPORT_URL = "android.app.extra.PROVISIONING_SUPPORT_URL";
field public static final String EXTRA_PROVISIONING_TRIGGER = "android.app.extra.PROVISIONING_TRIGGER";

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

@@ -2535,6 +2535,22 @@ public class DevicePolicyManager {
public static final String EXTRA_PROVISIONING_SUPPORTED_MODES =
"android.app.extra.PROVISIONING_SUPPORTED_MODES";
/**
* A boolean extra which determines whether to skip the ownership disclaimer screen during the
* provisioning flow. The default value is {@code false}.
*
* If the value is {@code true}, it is the responsibility of the provisioning initiator to
* show the relevant disclaimer.
*
* <p>This extra is only respected when provided alongside the {@link
* #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent action.
*
* @hide
*/
@SystemApi
public static final String EXTRA_PROVISIONING_SKIP_OWNERSHIP_DISCLAIMER =
"android.app.extra.PROVISIONING_SKIP_OWNERSHIP_DISCLAIMER";
/**
* An {@link ArrayList} of {@link Integer} extra specifying the allowed provisioning modes.
* <p>This extra will be passed to the admin app's {@link #ACTION_GET_PROVISIONING_MODE}