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

f942b9ad

Commit f942b9ad authored 1 year ago by Jigar Thakkar Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Prompt for screen lock setup during private space unlock" into main

parents 00e45419 489d0779

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/content/pm/multiuser.aconfig 8 additions, 1 deletion

core/java/android/content/pm/multiuser.aconfig
core/java/com/android/internal/app/SetScreenLockDialogActivity.java 160 additions, 0 deletions

...com/android/internal/app/SetScreenLockDialogActivity.java
core/res/AndroidManifest.xml 6 additions, 0 deletions

core/res/AndroidManifest.xml
core/res/res/values/strings.xml 7 additions, 0 deletions

core/res/res/values/strings.xml
core/res/res/values/symbols.xml 6 additions, 0 deletions

core/res/res/values/symbols.xml
services/core/java/com/android/server/pm/UserManagerService.java 22 additions, 1 deletion

...s/core/java/com/android/server/pm/UserManagerService.java

with 209 additions and 2 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