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

f4ba4e5c

Commit f4ba4e5c authored 1 year ago by Kangping Dong Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "[Thread] add DISALLOW_THREAD_NETWORK to policy sets" into main am: 54926190

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

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

parents 3640dbe5 54926190

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

services/core/java/com/android/server/pm/UserRestrictionsUtils.java 6 additions, 3 deletions

...ore/java/com/android/server/pm/UserRestrictionsUtils.java
services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java 4 additions, 0 deletions

...ava/com/android/server/devicepolicy/PolicyDefinition.java

with 10 additions and 3 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