Merge "Improve documentation for EXTRA_ROLE_HOLDER_STATE" (d2d8485b) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -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