Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev

Browse Source
This commit is contained in:
Antoan Angelov
2019-06-21 18:07:22 +00:00
committed by Android (Google) Code Review
parent 0031e00da6 bb2a802a23
commit ab34f61c3b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -278,6 +278,7 @@ public class DevicePolicyManager {
* <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li> * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li> * <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>
* </ul> * </ul>
* *
* <p>When device owner provisioning has completed, an intent of the type * <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_ORGANIZATION_NAME}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li> * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>
* <li>{@link #EXTRA_PROVISIONING_USE_MOBILE_DATA}, 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> * </ul>
* *
* @hide * @hide
@@ -1149,8 +1152,12 @@ public class DevicePolicyManager {
* A boolean extra indicating if the education screens from the provisioning flow should be * A boolean extra indicating if the education screens from the provisioning flow should be
* skipped. If unspecified, defaults to {@code false}. * skipped. If unspecified, defaults to {@code false}.
* *
* <p>This extra can only be set by the admin app when performing the admin-integrated * <p>This extra can be set in the following ways:
* provisioning flow as a result of the {@link #ACTION_GET_PROVISIONING_MODE} activity. * <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 * <p>If the education screens are skipped, it is the admin application's responsibility
* to display its own user education screens. * to display its own user education screens.