Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 587aebd3 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for... 

Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev am: efdd8dba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17156428

Change-Id: I92dda57f07a61b9be8dc0e69b33ffc9f21acddda
parents 641cfbe4 efdd8dba

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

+10 −0
Original line number Diff line number Diff line
@@ -3365,6 +3365,16 @@ public class DevicePolicyManager { 
     *     <li>General disclaimer relevant to the provisioning mode</li>

     * </ul>

     *

     * <p>When this {@link Intent} is started, the following intent extras will be supplied:

     * <ul>

     *     <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}</li>

     *     <li>{@link #EXTRA_PROVISIONING_MODE}</li>

     *     <li>{@link #EXTRA_PROVISIONING_LOCALE}</li>

     *     <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME}</li>

     *     <li>{@link #EXTRA_PROVISIONING_TIME_ZONE}</li>

     *     <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}</li>

     * </ul>

     *

     * <p>If the custom consent screens are granted by the user {@link Activity#RESULT_OK} is

     * returned, otherwise {@link Activity#RESULT_CANCELED} is returned. The device policy

     * management role holder should ensure that the provisioning flow terminates immediately if