Merge "Fix ACTION_PROVISIONING_SUCCESSFUL documentation" (77bada7e) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DeviceAdminReceiver.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -238,8 +238,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	* {@link android.app.admin.DevicePolicyManager#isProfileOwnerApp}. You will generally handle		* {@link android.app.admin.DevicePolicyManager#isProfileOwnerApp}. You will generally handle
	* this in {@link DeviceAdminReceiver#onProfileProvisioningComplete}.		* this in {@link DeviceAdminReceiver#onProfileProvisioningComplete}.
	*		*
	* <p>Input: Nothing.</p>		* @see DevicePolicyManager#ACTION_PROVISIONING_SUCCESSFUL
	* <p>Output: Nothing</p>
	*/		*/
	@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
	@BroadcastBehavior(explicitOnly = true)		@BroadcastBehavior(explicitOnly = true)
	@@ -669,6 +668,11 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	* profile owner needs to wait for data to be available if required (e.g. android device ids or		* profile owner needs to wait for data to be available if required (e.g. android device ids or
	* other data that is set as a result of server interactions).		* other data that is set as a result of server interactions).
	*		*
			* <p>From version {@link android.os.Build.VERSION_CODES#O}, when managed provisioning has
			* completed, along with this callback the activity intent
			* {@link DevicePolicyManager#ACTION_PROVISIONING_SUCCESSFUL} will also be sent to the same
			* application.
			*
	* @param context The running context as per {@link #onReceive}.		* @param context The running context as per {@link #onReceive}.
	* @param intent The received intent as per {@link #onReceive}.		* @param intent The received intent as per {@link #onReceive}.
	*/		*/

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -169,8 +169,7 @@ public class DevicePolicyManager {
	*		*
	* <p>From version {@link android.os.Build.VERSION_CODES#O}, when managed provisioning has		* <p>From version {@link android.os.Build.VERSION_CODES#O}, when managed provisioning has
	* completed, along with the above broadcast, activity intent		* completed, along with the above broadcast, activity intent
	* {@link #ACTION_PROVISIONING_SUCCESSFUL} will also be sent to the application specified in		* {@link #ACTION_PROVISIONING_SUCCESSFUL} will also be sent to the profile owner.
	* the provisioning intent.
	*		*
	* <p>If provisioning fails, the managedProfile is removed so the device returns to its		* <p>If provisioning fails, the managedProfile is removed so the device returns to its
	* previous state.		* previous state.
	@@ -857,8 +856,7 @@ public class DevicePolicyManager {
	* {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} broadcast but this will be		* {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} broadcast but this will be
	* delivered faster as it's an activity intent.		* delivered faster as it's an activity intent.
	*		*
	* <p>The intent is only sent to the application on the profile that requested provisioning. In		* <p>The intent is only sent to the new device or profile owner.
	* the device owner case the profile is the primary user.
	*		*
	* @see #ACTION_PROVISION_MANAGED_PROFILE		* @see #ACTION_PROVISION_MANAGED_PROFILE
	* @see #ACTION_PROVISION_MANAGED_DEVICE		* @see #ACTION_PROVISION_MANAGED_DEVICE