summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yu-Ting Tseng <yutingtseng@google.com> 2024-11-13 18:40:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-13 18:40:28 +0000
commited96441a512c9fa2e5b82de6cfe727e47b6510c6 (patch)
tree6c96335dd6dc64a77fdb5043c79a70c01d6c0a9e
parent851083e4fd91ea9992cae9e04d479be7422045db (diff)
parente3c2389962f01e37c4d792d6c443d534a8ff89f8 (diff)
Merge "Add shayba to RemoteCallbackList OWNERS" into main am: 1e0dbfcb50 am: e3c2389962
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3344920 Change-Id: I95287c71d35ebb9ee969763d0959a81e004f742c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/os/OWNERS3
-rw-r--r--core/tests/coretests/src/android/os/OWNERS3
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 590ddb404b63..24e1d6666093 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -78,6 +78,9 @@ per-file PatternMatcher* = file:/PACKAGE_MANAGER_OWNERS
# PermissionEnforcer
per-file PermissionEnforcer.java = tweek@google.com, brufino@google.com
+# RemoteCallbackList
+per-file RemoteCallbackList.java = shayba@google.com
+
# ART
per-file ArtModuleServiceManager.java = file:platform/art:/OWNERS
diff --git a/core/tests/coretests/src/android/os/OWNERS b/core/tests/coretests/src/android/os/OWNERS
index 6149382d0800..4620cb8d8148 100644
--- a/core/tests/coretests/src/android/os/OWNERS
+++ b/core/tests/coretests/src/android/os/OWNERS
@@ -12,3 +12,6 @@ per-file PerformanceHintManagerTest.java = file:/ADPF_OWNERS
# Caching
per-file IpcDataCache* = file:/PERFORMANCE_OWNERS
+
+# RemoteCallbackList
+per-file RemoteCallbackListTest.java = shayba@google.com