diff options
| author | 2019-06-21 11:15:06 -0700 | |
|---|---|---|
| committer | 2019-06-21 11:15:06 -0700 | |
| commit | 648eb2d3a77a80b3445b01adbf13fa7a165f7ad7 (patch) | |
| tree | 4f5fa9d03f13307d9744d77fc3dca7d76ec37074 | |
| parent | 95980038f2e2e5828cfae7680d1a514910c764bf (diff) | |
| parent | ab34f61c3b5cbe48d33c563596812984c27f53b9 (diff) | |
Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: ab34f61c3b
Change-Id: I4b0230f1429e5ca278fa6f5c15babddb1a71cda6
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 4b9aebd17794..441ff6ba4643 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -278,6 +278,7 @@ public class DevicePolicyManager { * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li> * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> * <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li> * </ul> * * <p>When device owner provisioning has completed, an intent of the type @@ -385,6 +386,8 @@ public class DevicePolicyManager { * <li>{@link #EXTRA_PROVISIONING_ORGANIZATION_NAME}, optional</li> * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li> * <li>{@link #EXTRA_PROVISIONING_USE_MOBILE_DATA}, optional </li> + * <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional - when not used for + * cloud enrollment, NFC or QR provisioning</li> * </ul> * * @hide @@ -1149,8 +1152,12 @@ public class DevicePolicyManager { * A boolean extra indicating if the education screens from the provisioning flow should be * skipped. If unspecified, defaults to {@code false}. * - * <p>This extra can only be set by the admin app when performing the admin-integrated - * provisioning flow as a result of the {@link #ACTION_GET_PROVISIONING_MODE} activity. + * <p>This extra can be set in the following ways: + * <ul> + * <li>By the admin app when performing the admin-integrated + * provisioning flow as a result of the {@link #ACTION_GET_PROVISIONING_MODE} activity</li> + * <li>With intent action {@link #ACTION_PROVISION_MANAGED_DEVICE}</li> + * </ul> * * <p>If the education screens are skipped, it is the admin application's responsibility * to display its own user education screens. |