summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Charles Chen <charlesccchen@google.com> 2021-03-24 11:13:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-03-24 11:13:57 +0000
commit0d35481d52e60a794274532a7cdd94e77211d6dc (patch)
tree8a9bdcdcf8abb86a822ba310c5a925b52ca1c4b1
parentcc0de009bea2d4f47a7af1c98ff5ffb5a70dcc37 (diff)
parent06b102a70d5579c954166a33b752ee8149e7936d (diff)
Merge "Add OWNERS for ComponentCallbacksController" am: 4eca6d0c5c am: 06b102a70d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642179 Change-Id: Ie4c1fd204c01f81b09818ba6ae3dc9f3a13fadb9
-rw-r--r--core/java/android/content/OWNERS2
-rw-r--r--core/tests/coretests/src/android/content/OWNERS2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/OWNERS b/core/java/android/content/OWNERS
index d0d406a0c9e6..01b554a56720 100644
--- a/core/java/android/content/OWNERS
+++ b/core/java/android/content/OWNERS
@@ -8,3 +8,5 @@ per-file Intent.java = patb@google.com
per-file AutofillOptions* = file:/core/java/android/service/autofill/OWNERS
per-file ContentCaptureOptions* = file:/core/java/android/service/contentcapture/OWNERS
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
diff --git a/core/tests/coretests/src/android/content/OWNERS b/core/tests/coretests/src/android/content/OWNERS
index c61a4b538a44..0b945895ad7f 100644
--- a/core/tests/coretests/src/android/content/OWNERS
+++ b/core/tests/coretests/src/android/content/OWNERS
@@ -2,3 +2,5 @@ per-file AssetTest.java = file:/core/java/android/content/res/OWNERS
per-file ContextTest.java = file:/services/core/java/com/android/server/wm/OWNERS
per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS
per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS
+per-file ComponentCallbacksControllerTest = file:/services/core/java/com/android/server/wm/OWNERS
+per-file ComponentCallbacksControllerTest = charlesccchen@google.com