diff options
| author | 2022-03-18 12:55:56 +0000 | |
|---|---|---|
| committer | 2022-03-18 12:55:56 +0000 | |
| commit | efdd8dba934699542b283bb9a69dfa5488f33b36 (patch) | |
| tree | e3f139a09e51e6bedf88b3b1fa8eeabf7c70aa86 | |
| parent | c2b95ea6aac2bab8448867c807ed1ade53891ae8 (diff) | |
| parent | bcfeecc59ad1862730e94d5cd59f1fd3e27f0aef (diff) | |
Merge "Update javadoc for EXTRA_PROVISIONING_ROLE_HOLDER_CUSTOM_USER_CONSENT_INTENT" into tm-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 13aae5cabefa..10e976f79b39 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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 |