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

1803b698

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

Downloads
- Plain Diff

Merge "Integrate admin policy into content protection consent check" into main

parents 8caa214f 0dc7cd73

No related branches found

No related tags found

No related merge requests found

Changes 3

Expand all Hide whitespace changes

Inline Side-by-side

Showing

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java 2 additions, 2 deletions

...d/server/contentcapture/ContentCaptureManagerService.java
services/contentcapture/java/com/android/server/contentprotection/ContentProtectionConsentManager.java 79 additions, 24 deletions

...er/contentprotection/ContentProtectionConsentManager.java
services/tests/servicestests/src/com/android/server/contentprotection/ContentProtectionConsentManagerTest.java 258 additions, 47 deletions

...ontentprotection/ContentProtectionConsentManagerTest.java

with 339 additions and 73 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