summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2023-01-07 02:34:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-07 02:34:32 +0000
commitbb441ba919d9f31b15955a6b80db222cdff0e4e1 (patch)
tree4bb7e5712df18a3378469e363d849bbcc39ad46a
parentfe8dd737165f7f5ffb7b27ab64d4e6bb25826290 (diff)
parent8239e26dd020b32cdca643b3ff39e05c28ea7b06 (diff)
Merge "Add owners file for broadcasts related code." am: 449d0f2531 am: 8239e26dd0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378046 Change-Id: Ieb9adf798c2cd549b76b5568025744c20b9430be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--BROADCASTS_OWNERS6
-rw-r--r--core/java/android/content/OWNERS1
-rw-r--r--services/core/java/com/android/server/am/OWNERS2
3 files changed, 9 insertions, 0 deletions
diff --git a/BROADCASTS_OWNERS b/BROADCASTS_OWNERS
new file mode 100644
index 000000000000..1ea610b1bad4
--- /dev/null
+++ b/BROADCASTS_OWNERS
@@ -0,0 +1,6 @@
+# Bug component: 316181
+ctate@android.com
+jsharkey@android.com
+jsharkey@google.com
+sudheersai@google.com
+yamasani@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/core/java/android/content/OWNERS b/core/java/android/content/OWNERS
index 1c9713df972a..2cde539ab1f8 100644
--- a/core/java/android/content/OWNERS
+++ b/core/java/android/content/OWNERS
@@ -13,3 +13,4 @@ per-file ContentCaptureOptions* = file:/core/java/android/service/contentcapture
per-file LocusId* = file:/core/java/android/service/contentcapture/OWNERS
per-file ComponentCallbacksController = file:/services/core/java/com/android/server/wm/OWNERS
per-file ComponentCallbacksController = charlesccchen@google.com
+per-file Broadcast* = file:/BROADCASTS_OWNERS
diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS
index da209f095897..5cdcd424d059 100644
--- a/services/core/java/com/android/server/am/OWNERS
+++ b/services/core/java/com/android/server/am/OWNERS
@@ -41,3 +41,5 @@ per-file ContentProviderHelper.java = varunshah@google.com, omakoto@google.com,
# Multiuser
per-file User* = file:/MULTIUSER_OWNERS
+# Broadcasts
+per-file Broadcast* = file:/BROADCASTS_OWNERS