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

9285ec7a

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

Downloads
- Plain Diff

Merge "Fix UnlockedDeviceRequired with weak unlock methods" into main am: 05955e38

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

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

parents 467712f5 05955e38

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/Authorization.java 4 additions, 2 deletions

keystore/java/android/security/Authorization.java
services/core/java/com/android/server/trust/TrustManagerService.java 70 additions, 8 deletions

...re/java/com/android/server/trust/TrustManagerService.java
services/tests/mockingservicestests/src/com/android/server/trust/TrustManagerServiceTest.java 201 additions, 5 deletions

...src/com/android/server/trust/TrustManagerServiceTest.java

with 275 additions and 15 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