summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peiyong Lin <lpy@google.com> 2021-11-18 23:04:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-18 23:04:05 +0000
commit9e526c1d918c43ed61c2bac02d18f6ac75016b38 (patch)
treea6c2b1da23e64998b64d906de321726e955abb6c
parent39465971f4031a5f3c3ea0047686a9a8ec2bfa1b (diff)
parent3afdacc87b4cc016d7336321f8a059127d187608 (diff)
Merge "Add owners for GameManager and GameManagerService" am: 6e9b910de2 am: 3afdacc87b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896952 Change-Id: Ic5c758c011bf2a98db0d6393b288d058f71dfba8
-rw-r--r--GAME_MANAGER_OWNERS2
-rw-r--r--core/java/android/app/OWNERS2
-rw-r--r--services/core/java/com/android/server/app/OWNERS1
3 files changed, 5 insertions, 0 deletions
diff --git a/GAME_MANAGER_OWNERS b/GAME_MANAGER_OWNERS
new file mode 100644
index 000000000000..502a9e362202
--- /dev/null
+++ b/GAME_MANAGER_OWNERS
@@ -0,0 +1,2 @@
+lpy@google.com
+timvp@google.com
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
index 4da51c13045b..2564228f23aa 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -29,6 +29,8 @@ per-file Service* = file:/services/core/java/com/android/server/am/OWNERS
per-file SystemServiceRegistry.java = file:/services/core/java/com/android/server/am/OWNERS
per-file *UserSwitchObserver* = file:/services/core/java/com/android/server/am/OWNERS
per-file UiAutomation.java = file:/services/accessibility/OWNERS
+per-file GameManager* = file:/GAME_MANAGER_OWNERS
+per-file IGameManager* = file:/GAME_MANAGER_OWNERS
# ActivityThread
per-file ActivityThread.java = file:/services/core/java/com/android/server/am/OWNERS
diff --git a/services/core/java/com/android/server/app/OWNERS b/services/core/java/com/android/server/app/OWNERS
new file mode 100644
index 000000000000..aaebbfa8e253
--- /dev/null
+++ b/services/core/java/com/android/server/app/OWNERS
@@ -0,0 +1 @@
+per-file GameManager* = file:/GAME_MANAGER_OWNERS