Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d7400cd8

Commit d7400cd8 authored 1 year ago by Nino Jagar Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Parse content protection group config" into main

parents 406e0c41 331fbdcc

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

core/java/android/view/contentprotection/flags/content_protection_flags.aconfig 7 additions, 0 deletions

.../contentprotection/flags/content_protection_flags.aconfig
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java 33 additions, 2 deletions

...d/server/contentcapture/ContentCaptureManagerService.java
services/tests/servicestests/src/com/android/server/contentcapture/ContentCaptureManagerServiceTest.java 68 additions, 3 deletions

...rver/contentcapture/ContentCaptureManagerServiceTest.java

with 108 additions and 5 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