summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hai Zhang <zhanghai@google.com> 2020-10-07 08:24:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-07 08:24:38 +0000
commit998b69eedd5e67a3f0d6f49fa688099df77c8777 (patch)
tree602a572544544207deee850eae003138558c5b38
parentd5c9a57bcf803702eb071bd39553550ca8efc833 (diff)
parent74a162c7b9cb3e6eaaed71bc555e2c9a19b92e2e (diff)
Merge "Add myself to system server permission code OWNERS." am: 1839f9f7f8 am: be5c84157b am: 74a162c7b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450996 Change-Id: I05f45b6dd697ec4022c7973cad0926cc8e46c0b2
-rw-r--r--services/core/java/com/android/server/pm/permission/OWNERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/permission/OWNERS b/services/core/java/com/android/server/pm/permission/OWNERS
index 01dc01efaca8..0e88862e01b1 100644
--- a/services/core/java/com/android/server/pm/permission/OWNERS
+++ b/services/core/java/com/android/server/pm/permission/OWNERS
@@ -1,4 +1,5 @@
moltmann@google.com
+zhanghai@google.com
per-file DefaultPermissionGrantPolicy.java = hackbod@android.com
per-file DefaultPermissionGrantPolicy.java = jsharkey@android.com
per-file DefaultPermissionGrantPolicy.java = svetoslavganov@google.com
@@ -7,3 +8,4 @@ per-file DefaultPermissionGrantPolicy.java = yamasani@google.com
per-file DefaultPermissionGrantPolicy.java = patb@google.com
per-file DefaultPermissionGrantPolicy.java = eugenesusla@google.com
per-file DefaultPermissionGrantPolicy.java = moltmann@google.com
+per-file DefaultPermissionGrantPolicy.java = zhanghai@google.com