diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 86ef2e4e74bba..687a9f544b3c1 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -892,6 +892,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"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7bc967fe251db..28b0618d356df 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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. + * + *
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. *
This extra will be passed to the admin app's {@link #ACTION_GET_PROVISIONING_MODE}