Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b569a0c5

Commit b569a0c5 authored 1 year ago by Treehugger Robot Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject."...

Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900

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

Change-Id: I75842c7097aaf25a28aa83a348672566ffc64f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 28d14d9c 2bcc7900

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 2 additions, 0 deletions

core/api/current.txt
core/java/android/hardware/biometrics/BiometricPrompt.java 18 additions, 1 deletion

core/java/android/hardware/biometrics/BiometricPrompt.java
core/java/android/hardware/biometrics/CryptoObject.java 18 additions, 0 deletions

core/java/android/hardware/biometrics/CryptoObject.java
core/java/android/hardware/fingerprint/FingerprintManager.java 13 additions, 0 deletions

...java/android/hardware/fingerprint/FingerprintManager.java
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java 3 additions, 0 deletions

...a/android/security/keystore2/AndroidKeyStoreProvider.java

with 54 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment