diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-12-13 11:40:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-13 11:40:16 +0000 |
| commit | 9dc97a8c67f83e3d5fa9887946963bc1676ec290 (patch) | |
| tree | 24b6f26e8ad5da3796161b9d0964f31f48323d33 /core/java | |
| parent | f2aff2c42c28574aa7323cc2306e992021ece1a7 (diff) | |
| parent | 6e2ee034978767abf5cc65c85d0ad3c944306af0 (diff) | |
Merge "Fix javadoc error when building SDK"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DelegatedAdminReceiver.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/DelegatedAdminReceiver.java b/core/java/android/app/admin/DelegatedAdminReceiver.java index 0da4e7e63110..960538251c5f 100644 --- a/core/java/android/app/admin/DelegatedAdminReceiver.java +++ b/core/java/android/app/admin/DelegatedAdminReceiver.java @@ -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}. diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 670f8db7c588..03e5933d300d 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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. |