Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

Browse Source 
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
This commit is contained in:
Joe Fernandez
2015-03-03 06:15:29 +00:00
committed by Android Git Automerger
parent 2cbda290f6 a31378dc49
commit c4418980a0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/admin/DeviceAdminReceiver.java
View File

@@ -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
@@ -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;

8
core/java/android/app/admin/DevicePolicyManager.java
View File

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