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

b67531ca

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

Downloads
- Plain Diff

Merge "[Thread] add API UserManager#DISALLOW_THREAD_NETWORK" into main am: 8a1eb3ca

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

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

parents ef5a67c8 8a1eb3ca

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 1 addition, 0 deletions

core/api/current.txt
core/java/android/os/UserManager.java 25 additions, 0 deletions

core/java/android/os/UserManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java 7 additions, 0 deletions

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

with 33 additions and 0 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