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

Merge "Fixing docs." into mnc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2015-05-05 17:24:32 +00:00
committed by Android (Google) Code Review
parent 1542179bd2 2f46d949e2
commit 9e540a5122
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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