Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2034f4cc authored by Nino Jagar's avatar Nino Jagar Committed by Automerger Merge Worker
Browse files

Merge "Take content protection ownership" into main am: 9a9dae8a 

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



Change-Id: Ie79a2057c069990b303041b95b682e3fef39c704
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67f73eb2 9a9dae8a

core/java/android/view/contentprotection/OWNERS

+4 −2
Original line number Diff line number Diff line 
# Bug component: 544200

# Bug component: 1040349



include /core/java/android/view/contentcapture/OWNERS

njagar@google.com

williamluh@google.com

aaronjosephs@google.com

core/tests/coretests/src/android/view/contentprotection/OWNERS

+2 −2
Original line number Diff line number Diff line 
# Bug component: 544200

# Bug component: 1040349



include /core/java/android/view/contentcapture/OWNERS

include /core/java/android/view/contentprotection/OWNERS

services/contentcapture/java/com/android/server/contentprotection/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Bug component: 1040349



include /core/java/android/view/contentprotection/OWNERS

services/tests/servicestests/src/com/android/server/contentprotection/OWNERS

+3 −2
Original line number Diff line number Diff line 
# Bug component: 544200

# Bug component: 1040349



include /core/java/android/view/contentprotection/OWNERS

include /core/java/android/view/contentcapture/OWNERS