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

Merge "Improve documentation for EXTRA_ROLE_HOLDER_STATE"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-01 15:54:35 +00:00
committed by Android (Google) Code Review
parent 2dae724f1d fd2fd2caa4
commit d2d8485be9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,7 +633,7 @@ public class DevicePolicyManager {
* #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} to signal that an update
* to the role holder is required.
*
* <p>This result code must be accompanied by {@link #EXTRA_ROLE_HOLDER_STATE}.
* <p>This result code can be accompanied by {@link #EXTRA_ROLE_HOLDER_STATE}.
*
* @hide
*/
@@ -641,15 +641,19 @@ public class DevicePolicyManager {
public static final int RESULT_UPDATE_ROLE_HOLDER = 2;
/**
* A {@link Bundle} extra which describes the state of the role holder at the time when it
* returns {@link #RESULT_UPDATE_ROLE_HOLDER}.
* A {@link PersistableBundle} extra which the role holder can use to describe its own state
* when it returns {@link #RESULT_UPDATE_ROLE_HOLDER}.
*
* <p>After the update completes, the role holder's {@link
* #ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE} or {@link
* <p>If {@link #RESULT_UPDATE_ROLE_HOLDER} was accompanied by this extra, after the update
* completes, the role holder's {@link #ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE} or {@link
* #ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent will be relaunched,
* which will contain this extra. It is the role holder's responsibility to restore its
* state from this extra.
*
* <p>The content of this {@link PersistableBundle} is entirely up to the role holder. It
* should contain anything the role holder needs to restore its original state when it gets
* restarted.
*
* @hide
*/
@SystemApi