summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victor Hsieh <victorhsieh@google.com> 2023-10-13 23:22:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-13 23:22:30 +0000
commita058f78c74d90e3a7ae159b1bd87fa24e39a6723 (patch)
tree086bb8e6cd0f9a4efcd05282446a1de9e1b244f4
parent04a5e625f0958710c8ceecfdafc6eaebeab52b2e (diff)
parent7aae71e171b09137c162c132dfd31e7f423c5f57 (diff)
Merge "Add OWNERS for JNI and test of PersistentDataBlockService" into main am: 3a5825e55e am: 6cdbd5de66 am: 7aae71e171
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787037 Change-Id: I790d4424a2b776477dc89543572b06302d4abd37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/jni/OWNERS1
-rw-r--r--services/tests/servicestests/src/com/android/server/pdb/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS
index d9acf4182736..bc294902f0fc 100644
--- a/services/core/jni/OWNERS
+++ b/services/core/jni/OWNERS
@@ -20,6 +20,7 @@ per-file com_android_server_lights_* = file:/services/core/java/com/android/serv
per-file com_android_server_location_* = file:/location/java/android/location/OWNERS
per-file com_android_server_locksettings_* = file:/services/core/java/com/android/server/locksettings/OWNERS
per-file com_android_server_net_* = file:/services/core/java/com/android/server/net/OWNERS
+per-file com_android_server_pdb_* = file:/services/core/java/com/android/server/pdb/OWNERS
per-file com_android_server_pm_* = file:/services/core/java/com/android/server/pm/OWNERS
per-file com_android_server_power_* = file:/services/core/java/com/android/server/power/OWNERS
per-file com_android_server_powerstats_* = file:/services/core/java/com/android/server/powerstats/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/pdb/OWNERS b/services/tests/servicestests/src/com/android/server/pdb/OWNERS
new file mode 100644
index 000000000000..6dfb888dedad
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pdb/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pdb/OWNERS