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

Commit 4582f811 authored by Alan Treadway's avatar Alan Treadway
Browse files

Update documentation of DevicePolicyManager intents. 

Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
parent 8dbd4848

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