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

4869428f

Commit 4869428f authored 9 months ago by Veena Arvind Committed by Automerger Merge Worker 9 months ago

Downloads
- Plain Diff

Merge "Don't unlock other users if user 0 or parent user does not contain...

Merge "Don't unlock other users if user 0 or parent user does not contain escrow data." into main am: 284075a5

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

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

parents 86a93d47 284075a5

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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/locksettings/RebootEscrowManager.java 54 additions, 7 deletions

.../com/android/server/locksettings/RebootEscrowManager.java
services/tests/servicestests/src/com/android/server/locksettings/RebootEscrowManagerTests.java 224 additions, 16 deletions

...android/server/locksettings/RebootEscrowManagerTests.java

with 279 additions and 24 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