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

Commit 42121eea authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Update javadoc for role holder updater action" into tm-dev

parents 68c29dc3 7507f95d

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1682,7 +1682,7 @@ public class DevicePolicyManager { 
    public @interface ProvisioningConfiguration {}

    public @interface ProvisioningConfiguration {}

















    /**







    /**











     * A String extra holding the provisioning trigger. It could be one of







     * An int extra holding the provisioning trigger. It could be one of











     * {@link #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT}, {@link #PROVISIONING_TRIGGER_QR_CODE},







     * {@link #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT}, {@link #PROVISIONING_TRIGGER_QR_CODE},











     * {@link #PROVISIONING_TRIGGER_MANAGED_ACCOUNT} or {@link







     * {@link #PROVISIONING_TRIGGER_MANAGED_ACCOUNT} or {@link











     * #PROVISIONING_TRIGGER_UNSPECIFIED}.







     * #PROVISIONING_TRIGGER_UNSPECIFIED}.










@@ -3298,9 +3298,9 @@ public class DevicePolicyManager {









     * Activity action: Starts the device policy management role holder updater.







     * Activity action: Starts the device policy management role holder updater.











     *







     *











     * <p>The activity must handle the device policy management role holder update and set the







     * <p>The activity must handle the device policy management role holder update and set the











     * intent result to either {@link Activity#RESULT_OK} if the update was successful, {@link







     * intent result to either {@link Activity#RESULT_OK} if the update was successful or not











     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if it encounters a







     * necessary, {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if











     * problem that may be solved by relaunching it again, {@link







     * it encounters a problem that may be solved by relaunching it again, {@link











     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED} if role holder







     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED} if role holder











     * provisioning is disabled, or {@link







     * provisioning is disabled, or {@link











     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters







     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters