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

93901f87

Commit 93901f87 authored 1 year ago by Eran Messeri Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "MGF1 Digest setter: Handle case of flag off" into main am: e0ad83b3

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

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

parents 2c47c49d e0ad83b3

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 6 additions, 6 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/KeyGenParameterSpec.java 3 additions, 3 deletions

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

keystore/java/android/security/keystore/KeyProtection.java
keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java 17 additions, 0 deletions

...ecurity/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java 21 additions, 0 deletions

...e/java/android/security/keystore2/AndroidKeyStoreSpi.java

with 57 additions and 12 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