diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-03-26 13:16:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-26 13:16:07 +0000 |
| commit | a55c27a79b01a7903c765618a174c2273804a249 (patch) | |
| tree | 5d74956f3095454520f8ee37fa7e25b200e54757 | |
| parent | d5752bdc8fd39d4f0a508f9088c538e30e73044a (diff) | |
| parent | 44ef750bd4cefd5141616b7fb482bd62b35dd830 (diff) | |
| download | frameworks_base-a55c27a79b01a7903c765618a174c2273804a249.zip frameworks_base-a55c27a79b01a7903c765618a174c2273804a249.tar.gz frameworks_base-a55c27a79b01a7903c765618a174c2273804a249.tar.bz2 | |
Merge "Change doc for device initializer agent extra's type."
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index ea48b61..ee348bf 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -175,7 +175,8 @@ public class DevicePolicyManager { * * <p>This component is set as device owner and active admin when device owner provisioning is * started by an NFC message containing an NFC record with MIME type - * {@link #MIME_TYPE_PROVISIONING_NFC_V2}. + * {@link #MIME_TYPE_PROVISIONING_NFC_V2}. For the NFC record, the component name should be + * flattened to a string, via {@link ComponentName#flattenToShortString()}. * * @see DeviceAdminReceiver */ @@ -398,14 +399,16 @@ public class DevicePolicyManager { "android.app.extra.PROVISIONING_SKIP_ENCRYPTION"; /** - * On devices managed by a device owner app, a String representation of a Component name extra - * indicating the component of the application that is temporarily granted device owner - * privileges during device initialization and profile owner privileges during secondary user - * initialization. + * On devices managed by a device owner app, a {@link ComponentName} extra indicating the + * component of the application that is temporarily granted device owner privileges during + * device initialization and profile owner privileges during secondary user initialization. * - * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC_V2} that starts device owner - * provisioning via an NFC bump. - * @see ComponentName#unflattenFromString() + * <p> + * It can also be used in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC_v2} that starts + * device owner provisioning via an NFC bump. For the NFC record, it should be flattened to a + * string first. + * + * @see ComponentName#flattenToShortString() */ public static final String EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME"; |