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

Commit 190a88d2 authored by Alan Treadway's avatar Alan Treadway Committed by Android (Google) Code Review
Browse files

Merge "Update documentation of DevicePolicyManager intents." into mnc-dev

parents d5a6df6d 4582f811

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

+10 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ public class DevicePolicyManager { 
     *

     * <p> If provisioning fails, the managedProfile is removed so the device returns to its

     * previous state.

     *

     * <p>If launched with {@link android.app.Activity#startActivityForResult(Intent, int)} a

     * result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part of

     * 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.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PROVISION_MANAGED_PROFILE
@@ -158,6 +164,10 @@ public class DevicePolicyManager { 
     *

     * <p> If provisioning fails, the device is factory reset.

     *

     * <p>A result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part

     * of 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.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PROVISION_MANAGED_DEVICE