summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaomi Musgrave <nmusgrave@google.com>2023-02-16 16:18:03 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-02-16 16:18:03 +0000
commit88dbdfc9fcfa2811e6fa638d4a97eff944ffd31f (patch)
treef3d2017cf961bc645feb319464321d33346f14ed
parent0f85fb2cd0a87cd4312d57ecc05e1703b5f8a7ba (diff)
parentabccffcc0abf85f4ac87179fc5235bfa3fdbfd8c (diff)
downloadbase-android11-dev.tar.gz
Merge "Update OWNERS for MediaProjection & related classes" into android11-devandroid11-dev
-rw-r--r--media/java/android/media/projection/OWNERS3
-rw-r--r--services/core/java/com/android/server/media/projection/OWNERS2
-rw-r--r--services/tests/servicestests/src/com/android/server/media/projection/OWNERS1
3 files changed, 5 insertions, 1 deletions
diff --git a/media/java/android/media/projection/OWNERS b/media/java/android/media/projection/OWNERS
index 7e7335d68d3b..2273f816ac60 100644
--- a/media/java/android/media/projection/OWNERS
+++ b/media/java/android/media/projection/OWNERS
@@ -1 +1,4 @@
michaelwr@google.com
+santoscordon@google.com
+chaviw@google.com
+nmusgrave@google.com
diff --git a/services/core/java/com/android/server/media/projection/OWNERS b/services/core/java/com/android/server/media/projection/OWNERS
index 7e7335d68d3b..832bcd9d70e6 100644
--- a/services/core/java/com/android/server/media/projection/OWNERS
+++ b/services/core/java/com/android/server/media/projection/OWNERS
@@ -1 +1 @@
-michaelwr@google.com
+include /media/java/android/media/projection/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/media/projection/OWNERS b/services/tests/servicestests/src/com/android/server/media/projection/OWNERS
new file mode 100644
index 000000000000..832bcd9d70e6
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/media/projection/OWNERS
@@ -0,0 +1 @@
+include /media/java/android/media/projection/OWNERS