summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/admin
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-09-03 08:55:05 -0700
committerBrian Carlstrom <bdc@google.com>2014-09-03 09:00:06 -0700
commitf1fe51b9140a855515e257ebb85e6cba88ea89e7 (patch)
treebdeb1287e122419e96e1bcbc3d08a3de5fd8458c /core/java/android/app/admin
parent053ff3c776d51dd216f3b87b692336570439033b (diff)
downloadframeworks_base-f1fe51b9140a855515e257ebb85e6cba88ea89e7.zip
frameworks_base-f1fe51b9140a855515e257ebb85e6cba88ea89e7.tar.gz
frameworks_base-f1fe51b9140a855515e257ebb85e6cba88ea89e7.tar.bz2
Fix DevicePolicyManager javadoc
Bug: 17126717 Change-Id: Ib1d83a0e2003296ec1e17fa7c43e32c55b044df3
Diffstat (limited to 'core/java/android/app/admin')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9ed8960..12a94e9 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -115,13 +115,14 @@ public class DevicePolicyManager {
= "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";
/**
- * A {@link Parcelable} extra of type {@link PersistableBundle} that allows a mobile device
- * management application that starts managed profile provisioning to pass data to itself on the
- * managed profile when provisioning completes. The mobile device management application sends
- * this extra in an intent with the action {@link #ACTION_PROVISION_MANAGED_PROFILE} and
- * receives it in {@link DeviceAdminReceiver#onProfileProvisioningComplete} via an intent with
- * the action {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}. The bundle is
- * not changed during the managed profile provisioning.
+ * A {@link android.os.Parcelable} extra of type {@link android.os.PersistableBundle} that allows
+ * a mobile device management application that starts managed profile provisioning to pass data
+ * to itself on the managed profile when provisioning completes. The mobile device management
+ * application sends this extra in an intent with the action
+ * {@link #ACTION_PROVISION_MANAGED_PROFILE} and receives it in
+ * {@link DeviceAdminReceiver#onProfileProvisioningComplete} via an intent with the action
+ * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}. The bundle is not changed
+ * during the managed profile provisioning.
*/
public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE =
"android.app.extra.ADMIN_EXTRA_BUNDLE";