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

Commit d183ec59 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Javadoc improvements related to the device policy management role... 

Merge "Javadoc improvements related to the device policy management role holder updater" into tm-dev am: c3dbe772 am: b202b389

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

Change-Id: If792229c1a94338d47d911effff5a737c76b0d31
parents ab3b7583 b202b389

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

+32 −0
Original line number Diff line number Diff line
@@ -242,6 +242,17 @@ public class DevicePolicyManager { 
     * the provisioning flow was successful, although this doesn't guarantee the full flow will

     * succeed. Conversely a result code of {@link android.app.Activity#RESULT_CANCELED} implies

     * that the user backed-out of provisioning, or some precondition for provisioning wasn't met.

     *

     * <p>If a device policy management role holder (DPMRH) updater is present on the device, an

     * internet connection attempt must be made prior to launching this intent. If internet

     * connection could not be established, provisioning will fail unless {@link

     * #EXTRA_PROVISIONING_ALLOW_OFFLINE} is explicitly set to {@code true}, in which case

     * provisioning will continue without using the DPMRH. If an internet connection has been

     * established, the DPMRH updater will be launched, which will update the DPMRH if it's not

     * present on the device, or if it's present and not valid.

     *

     * <p>If a DPMRH is present on the device and valid, the provisioning flow will be deferred to

     * it.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PROVISION_MANAGED_PROFILE
@@ -398,6 +409,23 @@ public class DevicePolicyManager { 
     * by a privileged app with the permission

     * {@link android.Manifest.permission#DISPATCH_PROVISIONING_MESSAGE}.

     *

     * <p>If a device policy management role holder (DPMRH) updater is present on the device, an

     * internet connection attempt must be made prior to launching this intent. If internet

     * connection could not be established, provisioning will fail unless {@link

     * #EXTRA_PROVISIONING_ALLOW_OFFLINE} is explicitly set to {@code true}, in which case

     * provisioning will continue without using the DPMRH. If an internet connection has been

     * established, the DPMRH updater will be launched via {@link

     * #ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER}, which will update the DPMRH if it's not

     * present on the device, or if it's present and not valid.

     *

     * <p>A DPMRH is considered valid if it has intent filters for {@link

     * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}, {@link

     * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE} and {@link

     * #ACTION_ROLE_HOLDER_PROVISION_FINALIZATION}.

     *

     * <p>If a DPMRH is present on the device and valid, the provisioning flow will be deferred to

     * it via the {@link #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent.

     *

     * <p>The provisioning intent contains the following properties:

     * <ul>

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}</li>
@@ -537,6 +565,10 @@ public class DevicePolicyManager { 
     * <li>{@link #STATE_USER_PROFILE_COMPLETE}</li>

     * </ul>

     *

     * <p>If a device policy management role holder (DPMRH) is present on the device and

     * valid, the provisioning flow will be deferred to it via the {@link

     * #ACTION_ROLE_HOLDER_PROVISION_FINALIZATION} intent.

     *

     * @hide

     */

    @SystemApi