From 27f5337841f41dabbbf4db57e7091e54c4ab61a0 Mon Sep 17 00:00:00 2001 From: Andrew Solovay Date: Mon, 2 Mar 2015 16:37:59 -0800 Subject: [PATCH] Minor typo fixes in managed profile Javadoc reference pages. See first comment for stage location. bug: 19389235 Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c --- core/java/android/app/admin/DeviceAdminReceiver.java | 6 ++++-- core/java/android/app/admin/DevicePolicyManager.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index e9cce51ec2a46..458dd5b0fa09c 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -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}). * *

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 @@ -226,8 +227,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; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a30ae573066d8..1ebc0c1afdd23 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -96,14 +96,14 @@ public class DevicePolicyManager { * device as a personal and corporate device. The user which provisioning is started from and * the managed profile share a launcher. * - *

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 + *

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. * *

This intent must contain the extra {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}. * *

When managed provisioning has completed, an intent of the type - * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcasted to the + * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcast to the * managed profile. * *

If provisioning fails, the managedProfile is removed so the device returns to its