Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: ab34f61c3b (c6033fe6) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -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.