Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update javadocs for EXTRA_ROLE_HOLDER_UPDATE_RESULT_CODE" into tm-dev

Browse Source
This commit is contained in:
Antoan Angelov
2022-04-25 19:32:44 +00:00
committed by Android (Google) Code Review
parent d38f05b58f 6f1c9c3295
commit 6327cfe89b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3322,8 +3322,8 @@ 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 or not * intent result. This can include {@link Activity#RESULT_OK} if the update was successful,
* necessary, {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if * {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if
* it encounters a 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
@@ -3376,7 +3376,8 @@ public class DevicePolicyManager {
/** /**
* An {@code int} extra which contains the result code of the last attempt to update * An {@code int} extra which contains the result code of the last attempt to update
* the device policy management role holder. * the device policy management role holder via {@link
* #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER}.
* *
* <p>This extra is provided to the device policy management role holder via either {@link * <p>This extra is provided to the device policy management role holder via either {@link
* #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} or {@link * #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} or {@link
@@ -3394,6 +3395,8 @@ public class DevicePolicyManager {
* encounters a problem that may be solved by relaunching it again. * encounters a problem that may be solved by relaunching it again.
* <li>{@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if * <li>{@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if
* it encounters a problem that will not be solved by relaunching it again. * it encounters a problem that will not be solved by relaunching it again.
* <li>Any other value returned by {@link
* #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER}
* </ul> * </ul>
* *
* @hide * @hide