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

37927474

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

Downloads
- Plain Diff

Merge "Improve the documentation for UnlockedDeviceRequired" into main am: 9fe16854

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

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

parents d3dd115f 9fe16854

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

keystore/java/android/security/keystore/KeyGenParameterSpec.java 44 additions, 8 deletions

...e/java/android/security/keystore/KeyGenParameterSpec.java
keystore/java/android/security/keystore/KeyInfo.java 1 addition, 1 deletion

keystore/java/android/security/keystore/KeyInfo.java
keystore/java/android/security/keystore/KeyProtection.java 44 additions, 8 deletions

keystore/java/android/security/keystore/KeyProtection.java

with 89 additions and 17 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