From 94de8c890c14c1df1eaeca658686e7241a741bd0 Mon Sep 17 00:00:00 2001 From: Alan Treadway Date: Mon, 11 Jan 2016 10:25:23 +0000 Subject: Add extra to control USER_SETUP_COMPLETE behavior. For split-user cases it has been identified that provisioning a profile-owner during user setup-wizard shouldn't cause the setup-wizard to exit early generally. Adding this extra allows a DPC to control whether the user can take further steps in the setup-wizard after management provisioning completes. Adding as a hidden extra since we don't expect this to be useful until after N release. Bug: 25858670 Change-Id: I599a5df4aef659769a6323402efe078d0d12d2ed --- core/java/android/app/admin/DevicePolicyManager.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 4de3ceb4792e..dd942a915498 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -619,6 +619,21 @@ public class DevicePolicyManager { public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI"; + /** + * A boolean extra indicating if user setup should be skipped, for when provisioning is started + * during setup-wizard. + * + *

If unspecified, defaults to {@code true} to match the behavior in + * {@link android.os.Build.VERSION_CODES#M} and earlier. + * + *

Use in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}, + * {@link #ACTION_PROVISION_MANAGED_DEVICE} or {@link #ACTION_PROVISION_MANAGED_USER}. + * + * @hide + */ + public static final String EXTRA_PROVISIONING_SKIP_USER_SETUP = + "android.app.extra.PROVISIONING_SKIP_USER_SETUP"; + /** * This MIME type is used for starting the Device Owner provisioning. * -- cgit v1.2.3-59-g8ed1b