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

3720fa62

Commit 3720fa62 authored 4 years ago by Alex Johnston Committed by Android (Google) Code Review 4 years ago

Downloads
- Plain Diff

Merge "DPM API to enable or disable USB data signaling" into sc-dev

parents 202d4ab1 51f1c853

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

core/api/current.txt 3 additions, 0 deletions

core/api/current.txt
core/java/android/app/admin/DevicePolicyManager.java 80 additions, 0 deletions

core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl 5 additions, 0 deletions

core/java/android/app/admin/IDevicePolicyManager.aidl
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java 22 additions, 0 deletions

.../com/android/settingslib/RestrictedLockUtilsInternal.java
packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java 10 additions, 3 deletions

...ib/development/AbstractEnableAdbPreferenceController.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java 24 additions, 4 deletions

...ngslib/development/EnableAdbPreferenceControllerTest.java
services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java 13 additions, 0 deletions

...icy/java/com/android/server/devicepolicy/ActiveAdmin.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java 80 additions, 0 deletions

...droid/server/devicepolicy/DevicePolicyManagerService.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java 6 additions, 0 deletions

...rver/devicepolicy/DevicePolicyManagerServiceTestable.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java 77 additions, 0 deletions

.../android/server/devicepolicy/DevicePolicyManagerTest.java
services/tests/servicestests/src/com/android/server/devicepolicy/MockSystemServices.java 3 additions, 0 deletions

...c/com/android/server/devicepolicy/MockSystemServices.java

with 323 additions and 7 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