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

73bb247e

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

Downloads
- Plain Diff

Merge changes from topic "offbody-key-expiration" into main am: 8ec1eb1e

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

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

parents 4883dc24 8ec1eb1e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

keystore/java/android/security/AndroidKeyStoreMaintenance.java 0 additions, 14 deletions

...ore/java/android/security/AndroidKeyStoreMaintenance.java
keystore/java/android/security/KeyStore.java 0 additions, 7 deletions

keystore/java/android/security/KeyStore.java
keystore/java/android/security/keystore/KeyGenParameterSpec.java 9 additions, 9 deletions

...e/java/android/security/keystore/KeyGenParameterSpec.java
keystore/java/android/security/keystore/KeyProtection.java 9 additions, 9 deletions

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

with 18 additions and 39 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