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

Commit 9dc97a8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix javadoc error when building SDK"

parents f2aff2c4 6e2ee034

core/java/android/app/admin/DelegatedAdminReceiver.java

+4 −4
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ public class DelegatedAdminReceiver extends BroadcastReceiver { 
     *

     * <p> This callback is only applicable if the delegated app has

     * {@link DevicePolicyManager#DELEGATION_CERT_SELECTION} capability. Additionally, it must

     * declare an intent fitler for {@link #ACTION_CHOOSE_PRIVATE_KEY_ALIAS} in the receiver's

     * manifest in order to receive this callback.

     * declare an intent fitler for {@link DeviceAdminReceiver#ACTION_CHOOSE_PRIVATE_KEY_ALIAS}

     * in the receiver's manifest in order to receive this callback.

     *

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

     * @param intent The received intent as per {@link #onReceive}.
@@ -91,8 +91,8 @@ public class DelegatedAdminReceiver extends BroadcastReceiver { 
     *

     * <p> This callback is only applicable if the delegated app has

     * {@link DevicePolicyManager#DELEGATION_NETWORK_LOGGING} capability. Additionally, it must

     * declare an intent fitler for {@link #ACTION_NETWORK_LOGS_AVAILABLE} in the receiver's

     * manifest in order to receive this callback.

     * declare an intent fitler for {@link DeviceAdminReceiver#ACTION_NETWORK_LOGS_AVAILABLE} in the

     * receiver's manifest in order to receive this callback.

     *

     * @param context The running context 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 Diff line number Diff line
@@ -1637,7 +1637,7 @@ public class DevicePolicyManager { 
     * Grants access to selection of KeyChain certificates on behalf of requesting apps.

     * Once granted the app will start receiving

     * DelegatedAdminReceiver.onChoosePrivateKeyAlias. The caller (PO/DO) will

     * no longer receive {@link DeviceAdminReceiver#onChoosePrivateKeyAlias()}.

     * no longer receive {@link DeviceAdminReceiver#onChoosePrivateKeyAlias}.

     * There can be at most one app that has this delegation.

     * If another app already had delegated certificate selection access,

     * it will lose the delegation when a new app is delegated.