diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-03 16:10:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 16:10:53 +0000 |
| commit | 09cfeaff8e0c744085f0d068e41ad59f2639907f (patch) | |
| tree | 3c52bf6b546683f696bf4c11261349c623812022 | |
| parent | d9df4217237f9bc2ffb130d162afd4e90de5179c (diff) | |
| parent | f1fe51b9140a855515e257ebb85e6cba88ea89e7 (diff) | |
| download | frameworks_base-09cfeaff8e0c744085f0d068e41ad59f2639907f.zip frameworks_base-09cfeaff8e0c744085f0d068e41ad59f2639907f.tar.gz frameworks_base-09cfeaff8e0c744085f0d068e41ad59f2639907f.tar.bz2 | |
Merge "Fix DevicePolicyManager javadoc" into lmp-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 15 |
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"; |