summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jonathan Scott <scottjonathan@google.com> 2021-10-18 18:50:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-18 18:50:24 +0000
commitc0f002067128b4dec5f00d13b2e5decdc74681f8 (patch)
treed962fcbb4cad77304c265c59dd1b70afcabefd13
parent4089d3ed465ec859024aad74a4c36a632c29efdc (diff)
parent733ee81b0334895b09ecc7253c0b4938f5390eea (diff)
Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae am: 733ee81b03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102 Change-Id: Iaa05f7bc4d0ed56c190ef8b508b0abf2e07efef1
-rw-r--r--core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS4
-rw-r--r--core/java/android/app/admin/EnterprisePlatform_OWNERS2
-rw-r--r--core/java/android/app/admin/OWNERS10
-rw-r--r--core/java/android/app/admin/WorkDeviceExperience_OWNERS5
4 files changed, 13 insertions, 8 deletions
diff --git a/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS b/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS
new file mode 100644
index 000000000000..f5604347065e
--- /dev/null
+++ b/core/java/android/app/admin/EnterprisePlatformSecurity_OWNERS
@@ -0,0 +1,4 @@
+rubinxu@google.com
+acjohnston@google.com
+pgrafov@google.com
+alexkershaw@google.com #{LAST_RESORT_SUGGESTION} \ No newline at end of file
diff --git a/core/java/android/app/admin/EnterprisePlatform_OWNERS b/core/java/android/app/admin/EnterprisePlatform_OWNERS
new file mode 100644
index 000000000000..fb00fe506ed1
--- /dev/null
+++ b/core/java/android/app/admin/EnterprisePlatform_OWNERS
@@ -0,0 +1,2 @@
+file:WorkDeviceExperience_OWNERS
+file:EnterprisePlatformSecurity_OWNERS \ No newline at end of file
diff --git a/core/java/android/app/admin/OWNERS b/core/java/android/app/admin/OWNERS
index 6acbef29bec3..10a5f14dca9e 100644
--- a/core/java/android/app/admin/OWNERS
+++ b/core/java/android/app/admin/OWNERS
@@ -1,11 +1,5 @@
# Bug component: 142675
-# Android Enterprise team
-rubinxu@google.com
-sandness@google.com
-alexkershaw@google.com
-pgrafov@google.com
+file:EnterprisePlatform_OWNERS
-# Emeritus
-yamasani@google.com
-eranm@google.com
+yamasani@google.com #{LAST_RESORT_SUGGESTION} \ No newline at end of file
diff --git a/core/java/android/app/admin/WorkDeviceExperience_OWNERS b/core/java/android/app/admin/WorkDeviceExperience_OWNERS
new file mode 100644
index 000000000000..dcacaa25a236
--- /dev/null
+++ b/core/java/android/app/admin/WorkDeviceExperience_OWNERS
@@ -0,0 +1,5 @@
+work-device-experience+reviews@google.com
+scottjonathan@google.com
+arangelov@google.com
+kholoudm@google.com
+alexkershaw@google.com #{LAST_RESORT_SUGGESTION} \ No newline at end of file