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

Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev

Browse Source
This commit is contained in:
Antoan Angelov
2022-03-18 12:55:56 +00:00
committed by Android (Google) Code Review
parent c2b95ea6aa bcfeecc59a
commit efdd8dba93
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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