diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-03-03 13:08:57 -0800 |
|---|---|---|
| committer | Joe Fernandez <joefernandez@google.com> | 2015-03-03 13:08:57 -0800 |
| commit | 2eedc9f96ad225bd4fb745215504f84ab88d8f67 (patch) | |
| tree | 42ec2ca6c9bf73a2abdc4cf1f815b0ffe23b0dc9 /core/java/android/app | |
| parent | 9b98afca76592b8a1dc8d17dcaa99166f3658cb8 (diff) | |
| parent | 5864f5ed4bd934d7e483805b9b599f033c34ba44 (diff) | |
| download | frameworks_base-2eedc9f96ad225bd4fb745215504f84ab88d8f67.zip frameworks_base-2eedc9f96ad225bd4fb745215504f84ab88d8f67.tar.gz frameworks_base-2eedc9f96ad225bd4fb745215504f84ab88d8f67.tar.bz2 | |
resolved conflicts for merge of 5864f5ed to master
Change-Id: I6e413076af7fce85a5300abb2ba529c589dbc7e8
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 6 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 9a8dc52..4fc990e 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}). * * <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; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 6d5b4e0..170224d 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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}. * |