summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Siim Sammul <siims@google.com> 2021-04-08 07:47:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-08 07:47:30 +0000
commit99d2eef8bdfb8817833ab0972f8b0de6c725f137 (patch)
tree948c153fbaf524be008ccb63eab9b905b9f131e5
parent823f88cb97d5a7c12896f9ae79372de11bbb4e85 (diff)
parenta1a4e83e95f081d13458c290065949912c6416bb (diff)
Merge "Add dplotnikov@ and gaillard@ as owners for Binder related files" am: dea9900796 am: 4bb24cce53 am: a1a4e83e95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663985 Change-Id: I5314145f0152294cd247500a95f68c8b21997785
-rw-r--r--core/java/com/android/internal/os/BINDER_OWNERS2
-rw-r--r--core/java/com/android/internal/os/OWNERS1
-rw-r--r--services/core/java/com/android/server/OWNERS1
3 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/BINDER_OWNERS b/core/java/com/android/internal/os/BINDER_OWNERS
new file mode 100644
index 000000000000..9f68a322058b
--- /dev/null
+++ b/core/java/com/android/internal/os/BINDER_OWNERS
@@ -0,0 +1,2 @@
+dplotnikov@google.com
+gaillard@google.com
diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index 3f01ebb1afe7..ea3b3a7b4056 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -1,6 +1,7 @@
per-file *Power* = file:/services/core/java/com/android/server/power/OWNERS
per-file *Zygote* = file:/ZYGOTE_OWNERS
per-file *Cpu* = file:CPU_OWNERS
+per-file *Binder* = file:BINDER_OWNERS
# BatteryStats
per-file BatterySipper.java = file:/BATTERY_STATS_OWNERS
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index c9836001da77..7057b8405abc 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -19,6 +19,7 @@ per-file ServiceWatcher.java = sooniln@google.com
per-file *Alarm* = file:/apex/jobscheduler/OWNERS
per-file *AppOp* = file:/core/java/android/permission/OWNERS
per-file *Battery* = file:/BATTERY_STATS_OWNERS
+per-file *Binder* = file:/core/java/com/android/internal/os/BINDER_OWNERS
per-file *Bluetooth* = file:/core/java/android/bluetooth/OWNERS
per-file *Gnss* = file:/services/core/java/com/android/server/location/OWNERS
per-file *Location* = file:/services/core/java/com/android/server/location/OWNERS