resolved conflicts for merge of 5864f5ed to master (2eedc9f9) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -209,7 +209,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* requested provisioning. In the device owner case the profile is the primary user.
		* The broadcast will also be limited to the {@link DeviceAdminReceiver} component
		* specified in the original intent or NFC bump that started the provisioning process
		* (@see DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE).
		* (see {@link DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE
		* DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE}).
		*
		* <p>A device admin application which listens to this intent can find out if the device was
		* provisioned for the device owner or profile owner case by calling respectively
		@@ -247,8 +248,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		/**
		* Name under which a DevicePolicy component publishes information
		* about itself. This meta-data must reference an XML resource containing
		* a device-admin tag. XXX TO DO: describe syntax.
		* a device-admin tag.
		*/
		// TO DO: describe syntax.
		public static final String DEVICE_ADMIN_META_DATA = "android.app.device_admin";

		private DevicePolicyManager mManager;

+3 −3

Original line number	Diff line number	Diff line
		@@ -104,9 +104,9 @@ public class DevicePolicyManager {
		* device as a personal and corporate device. The user which provisioning is started from and
		* the managed profile share a launcher.
		*
		* <p>This intent will typically be sent by a mobile device management application (mdm).
		* Provisioning adds a managed profile and sets the mdm as the profile owner who has full
		* control over the profile
		* <p>This intent will typically be sent by a mobile device management application (MDM).
		* Provisioning adds a managed profile and sets the MDM as the profile owner who has full
		* control over the profile.
		*
		* <p>This intent must contain the extra {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}.
		*