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

e4dc1592

Commit e4dc1592 authored 1 year ago by Eric Biggers Committed by Gerrit Code Review 1 year ago

Downloads
- Plain Diff

Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main

parents e597e6d5 9fece1ec

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

core/java/com/android/internal/widget/LockPatternUtils.java 2 additions, 1 deletion

core/java/com/android/internal/widget/LockPatternUtils.java
keystore/java/android/security/AndroidKeyStoreMaintenance.java 47 additions, 1 deletion

...ore/java/android/security/AndroidKeyStoreMaintenance.java
services/core/java/com/android/server/locksettings/LockSettingsService.java 127 additions, 26 deletions

.../com/android/server/locksettings/LockSettingsService.java
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java 9 additions, 4 deletions

...android/server/locksettings/SyntheticPasswordManager.java
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java 5 additions, 0 deletions

...roid/server/locksettings/LockSettingsServiceTestable.java

with 190 additions and 32 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