summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shaquille Johnson <ssjohnson@google.com> 2023-10-11 18:52:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-11 18:52:11 +0000
commit89aab62ce616cebb566ab14bdd73ce10e2bc8363 (patch)
tree03d39321e2f4674137d1a1c8c36391188eb1a7fd
parent6fe8c454f940a47fbb4cb1f7482c936bab6617de (diff)
parent67a3f5d62e1c93c51afc82ba1088d252e017486b (diff)
Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main am: d3a0d02b7f am: a6cccd043b am: c6b7565de8 am: 67a3f5d62e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784108 Change-Id: Ic8efe43aa2e3652ede15137e0238f7792c8e4f02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/hardware/biometrics/CryptoObject.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/biometrics/CryptoObject.java b/core/java/android/hardware/biometrics/CryptoObject.java
index 151f819329c9..6ac1efb49839 100644
--- a/core/java/android/hardware/biometrics/CryptoObject.java
+++ b/core/java/android/hardware/biometrics/CryptoObject.java
@@ -114,8 +114,8 @@ public class CryptoObject {
}
/**
- * Get {@link PresentationSession} object.
- * @return {@link PresentationSession} object or null if this doesn't contain one.
+ * Get {@link KeyAgreement} object.
+ * @return {@link KeyAgreement} object or null if this doesn't contain one.
*/
@FlaggedApi(FLAG_ADD_KEY_AGREEMENT_CRYPTO_OBJECT)
public KeyAgreement getKeyAgreement() {