diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-05-05 17:24:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 17:24:33 +0000 |
| commit | 9e540a512281560a9b4ffc0edbe68cddaf9bc3b4 (patch) | |
| tree | f2b3a5ad0add162d46ba6eec3ab788f1b7093fa8 | |
| parent | 1542179bd2bc82db31a925550b47151cf579c767 (diff) | |
| parent | 2f46d949e2e901eb4c0dcc3e8e3b8ddba2f24109 (diff) | |
| download | frameworks_base-9e540a512281560a9b4ffc0edbe68cddaf9bc3b4.zip frameworks_base-9e540a512281560a9b4ffc0edbe68cddaf9bc3b4.tar.gz frameworks_base-9e540a512281560a9b4ffc0edbe68cddaf9bc3b4.tar.bz2 | |
Merge "Fixing docs." into mnc-dev
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 8 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index aea413d..470804d 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -231,7 +231,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * device owner app. * * <p>The broadcast will be limited to the {@link DeviceAdminReceiver} component specified in - * the (@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME) field + * the {@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME} field * of the original intent or NFC bump that started the provisioning process. You will generally * handle this in {@link DeviceAdminReceiver#onReadyForUserInitialization}. * @@ -450,9 +450,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * * <p>It is not assumed that the device initializer is finished when it returns from * this call, as it may do additional setup asynchronously. The device initializer must call - * {DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any additional - * setup (such as adding an account by using the {@link AccountManager}) in order for the user - * to be functional. + * {@link DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any + * additional setup (such as adding an account by using the {@link AccountManager}) in order for + * the user to be functional. * * @param context The running context as per {@link #onReceive}. * @param intent The received intent as per {@link #onReceive}. diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9f71ea5..4b72dc3 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -412,7 +412,7 @@ public class DevicePolicyManager { = "android.app.action.MANAGED_PROFILE_PROVISIONED"; /** - * A boolean extra indicating whether device encryption is required as part of Device Owner + * A boolean extra indicating whether device encryption can be skipped as part of Device Owner * provisioning. * * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC_V2} that starts device owner |