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

642bdb48

Commit 642bdb48 authored 1 year ago by Rubin Xu Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Allow COPE admin to control screen configuration" into main

parents daa73949 928d31d4

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/app/admin/DevicePolicyManager.java 5 additions, 2 deletions

core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl 1 addition, 1 deletion

core/java/android/app/admin/IDevicePolicyManager.aidl
core/java/android/app/admin/flags/flags.aconfig 7 additions, 0 deletions

core/java/android/app/admin/flags/flags.aconfig
services/core/java/com/android/server/pm/UserRestrictionsUtils.java 5 additions, 3 deletions

...ore/java/com/android/server/pm/UserRestrictionsUtils.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java 11 additions, 3 deletions

...droid/server/devicepolicy/DevicePolicyManagerService.java

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