Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af491c6b authored by Julia Reynolds's avatar Julia Reynolds Committed by Android Git Automerger
Browse files

am ac032058: am 16d4d46a: am 9e540a51: Merge "Fixing docs." into mnc-dev 

* commit 'ac032058':
  Fixing docs.
parents 59aca840 ac032058

core/java/android/app/admin/DeviceAdminReceiver.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -231,7 +231,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     * device owner app.

     * device owner app.

     *

     *

     * <p>The broadcast will be limited to the {@link DeviceAdminReceiver} component specified in

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

     * of the original intent or NFC bump that started the provisioning process. You will generally

     * handle this in {@link DeviceAdminReceiver#onReadyForUserInitialization}.

     * 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

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

     * this call, as it may do additional setup asynchronously. The device initializer must call

     * {DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any additional

     * {@link DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any

     * setup (such as adding an account by using the {@link AccountManager}) in order for the user

     * additional setup (such as adding an account by using the {@link AccountManager}) in order for

     * to be functional.

     * the user to be functional.

     *

     *

     * @param context The running context as per {@link #onReceive}.

     * @param context The running context as per {@link #onReceive}.

     * @param intent The received intent as per {@link #onReceive}.

     * @param intent The received intent as per {@link #onReceive}.

core/java/android/app/admin/DevicePolicyManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ public class DevicePolicyManager { 
        = "android.app.action.MANAGED_PROFILE_PROVISIONED";

        = "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.

     * provisioning.

     *

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC_V2} that starts device owner

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC_V2} that starts device owner