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

b932bbb9

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

Downloads
- Plain Diff

Merge "Rename the fix_unlocked_device_required_keys flag" into main

parents 2506df92 27a776f5

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/android/security/flags.aconfig 1 addition, 1 deletion

core/java/android/security/flags.aconfig
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 1 addition, 1 deletion

...re/java/com/android/server/trust/TrustManagerService.java
tests/TrustTests/src/android/trust/test/GrantAndRevokeTrustTest.kt 2 additions, 2 deletions

...stTests/src/android/trust/test/GrantAndRevokeTrustTest.kt
tests/TrustTests/src/android/trust/test/lib/LockStateTrackingRule.kt 4 additions, 3 deletions

...Tests/src/android/trust/test/lib/LockStateTrackingRule.kt

with 9 additions and 8 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