summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shaquille Johnson <ssjohnson@google.com> 2023-10-11 17:58:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-11 17:58:11 +0000
commitc6b7565de859cbdc4b59a2a18fbc47e5aebaf27e (patch)
tree70c3953694543f7ae29b0a5c338f221cc90bef5b
parent85758663c19fcd7ed951acb26aa8336e5467ae60 (diff)
parenta6cccd043b8755bf3cbd1b91945591a9e1462fae (diff)
Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main am: d3a0d02b7f am: a6cccd043b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784108 Change-Id: Ib878bebf9035cd6c23aed1115a143b4f7470684b 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() {