summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2020-12-15 00:25:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-15 00:25:33 +0000
commit305b2ce55427318f3c8fa59265d1effa2491ce61 (patch)
tree27566b0c864aeb841ea62fa6434766f90ebd4d85
parent49f7265198f653151c1f8d8b6d3e4f4b9123c326 (diff)
parent8ef2e0426a1b3eca25c758c2e27c7c7235423450 (diff)
Merge "Add OTA team as the owner of recovery systems" am: 8ef2e0426a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528858 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieb0064c6fcd6ba1c0b4a26b415541f1c55d7c231
-rw-r--r--core/java/android/os/OWNERS4
-rw-r--r--services/core/java/com/android/server/recoverysystem/OWNERS2
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 6aa1be92c3b5..2baae7a7bea5 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -28,3 +28,7 @@ per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS
per-file *Power* = file:/services/core/java/com/android/server/power/OWNERS
per-file *Telephony* = file:/telephony/OWNERS
per-file *Zygote* = file:/ZYGOTE_OWNERS
+
+# RecoverySystem
+per-file IRecoverySystem.aidl = rvrolyk@google.com, zhaojiac@google.com
+per-file RecoverySystem.java = rvrolyk@google.com, zhaojiac@google.com
diff --git a/services/core/java/com/android/server/recoverysystem/OWNERS b/services/core/java/com/android/server/recoverysystem/OWNERS
new file mode 100644
index 000000000000..79ded0dfba77
--- /dev/null
+++ b/services/core/java/com/android/server/recoverysystem/OWNERS
@@ -0,0 +1,2 @@
+rvrolyk@google.com
+zhaojiac@google.com