summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ThiƩbaud Weksteen <tweek@google.com> 2022-11-02 23:37:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-02 23:37:19 +0000
commit1799c950be1f6885e33bb99f47c7ad4a35b95438 (patch)
tree4641a6fb1e734a2b315266d9f2cc9403bc07231e
parent0c93fbab73f28d9b759463a41f1be8f153bf2e5f (diff)
parent4f2bc9a73a4403a91644668de899301bf3b4124f (diff)
Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2271808 Change-Id: Id668deb3f8ec6b08f6e0bc9556e54cf317d41cfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/os/OWNERS4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index d84037f66648..9d8df7e62bce 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -70,3 +70,7 @@ per-file Vintf* = file:/platform/system/libvintf:/OWNERS
# Tracing
per-file Trace.java = file:/TRACE_OWNERS
+
+# PermissionEnforcer
+per-file PermissionEnforcer.java = tweek@google.com, brufino@google.com
+per-file PermissionEnforcer.java = file:/core/java/android/permission/OWNERS