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

Commit c6b7565d authored by Shaquille Johnson's avatar Shaquille Johnson Committed by Automerger Merge Worker
Browse files

Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main... 

Merge "biometric: Fix misspelling of javadoc link to KeyAgreement" into main am: d3a0d02b am: a6cccd04

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784108



Change-Id: Ib878bebf9035cd6c23aed1115a143b4f7470684b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85758663 a6cccd04

core/java/android/hardware/biometrics/CryptoObject.java

+2 −2
Original line number Diff line number Diff line
@@ -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() {