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

146a86be

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

Downloads
- Plain Diff

Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into...

Merge "Split Keystore's onLockScreenEvent into onDevice{Unlocked,Locked}" into main am: 20821529 am: 85c8ac51 am: ee44db6f

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

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

parents 0e782f51 ee44db6f

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 25 additions, 15 deletions

keystore/java/android/security/Authorization.java
services/core/java/com/android/server/locksettings/LockSettingsService.java 1 addition, 1 deletion

.../com/android/server/locksettings/LockSettingsService.java
services/core/java/com/android/server/trust/TrustManagerService.java 18 additions, 10 deletions

...re/java/com/android/server/trust/TrustManagerService.java

with 44 additions and 26 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