diff options
| author | 2016-01-11 10:25:23 +0000 | |
|---|---|---|
| committer | 2016-01-13 12:49:23 +0000 | |
| commit | 94de8c890c14c1df1eaeca658686e7241a741bd0 (patch) | |
| tree | d7c06dafaff3bda56681d88c427a01faa0dc2ccf | |
| parent | 2d12690d70244ce14e87d7b51998be0a0382d650 (diff) | |
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
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 15 |
1 files changed, 15 insertions, 0 deletions
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 @@ -620,6 +620,21 @@ public class DevicePolicyManager { "android.app.extra.PROVISIONING_LOGO_URI"; /** + * A boolean extra indicating if user setup should be skipped, for when provisioning is started + * during setup-wizard. + * + * <p>If unspecified, defaults to {@code true} to match the behavior in + * {@link android.os.Build.VERSION_CODES#M} and earlier. + * + * <p>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. * * <p>During device owner provisioning a device admin app is set as the owner of the device. |