diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 06:29:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 06:29:33 +0000 |
| commit | 246a3a4a797edf5850073ec8f6b8aa997947d09b (patch) | |
| tree | 314be1e184c1953f642fcfc45719088c16a044af /core | |
| parent | a81ed3cd0f73138832c8386ee66dcbf2b4dce928 (diff) | |
| parent | 14fcef3bf02f46a057676d7a6d755daee735c4ea (diff) | |
| download | frameworks_base-246a3a4a797edf5850073ec8f6b8aa997947d09b.zip frameworks_base-246a3a4a797edf5850073ec8f6b8aa997947d09b.tar.gz frameworks_base-246a3a4a797edf5850073ec8f6b8aa997947d09b.tar.bz2 | |
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 6 | ||||
| -rw-r--r-- | 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 381d851..c53e749 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -208,7 +208,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 @@ -225,8 +226,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 6160bb6..a01a96a 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -101,14 +101,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. * - * <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}. * * <p> 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. * * <p> If provisioning fails, the managedProfile is removed so the device returns to its |