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

ef8f0e09

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

Downloads
- Plain Diff

Merge changes Ica472482,I32381136 into main am: f4c7c30b am: 3f1086d9 am: 1ff3c08b

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

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

parents 2111ca5a 1ff3c08b

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/LockscreenCredential.java 5 additions, 5 deletions

...ava/com/android/internal/widget/LockscreenCredential.java
services/core/java/com/android/server/locksettings/LockSettingsService.java 32 additions, 31 deletions

.../com/android/server/locksettings/LockSettingsService.java
services/core/java/com/android/server/locksettings/LockSettingsStorage.java 2 additions, 2 deletions

.../com/android/server/locksettings/LockSettingsStorage.java
services/core/java/com/android/server/locksettings/UnifiedProfilePasswordCache.java 18 additions, 16 deletions

...roid/server/locksettings/UnifiedProfilePasswordCache.java
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java 2 additions, 2 deletions

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

with 59 additions and 56 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