Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

7ce9b0f2

Commit 7ce9b0f2 authored 1 year ago by Eric Biggers Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Add isUnlockedDeviceRequired() method to KeyInfo" into main am: c5f61a2d

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

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

parents 35935a2c c5f61a2d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 1 addition, 0 deletions

core/api/current.txt
core/java/android/security/flags.aconfig 7 additions, 0 deletions

core/java/android/security/flags.aconfig
keystore/java/android/security/keystore/KeyInfo.java 18 additions, 0 deletions

keystore/java/android/security/keystore/KeyInfo.java
keystore/java/android/security/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java 5 additions, 0 deletions

...ecurity/keystore2/AndroidKeyStoreSecretKeyFactorySpi.java

with 31 additions and 0 deletions

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