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

Commit a948eb1b authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for role holder updater action" into tm-dev am: 42121eea am: 9a4bc53a 

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



Change-Id: I6b29f387fc6665673ea8291e0b7e86a171ee7f83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f6e3bbb 9a4bc53a

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

+4 −4
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ public class DevicePolicyManager { 
    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_MANAGED_ACCOUNT} or {@link















     * #PROVISIONING_TRIGGER_UNSPECIFIED}.










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













     * 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













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













     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if it encounters a













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













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













     * necessary, {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if













     * 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















     * provisioning is disabled, or {@link















     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters