summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2021-01-19 17:35:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-19 17:35:12 +0000
commite01117d31dd44435adb7a43c61415e66f0483256 (patch)
tree7e4b40d7dc8e4e82ec4efd8658dfe124eae0391f
parentc7640aa6d0737fac420c5a18e3a389fc43d815f0 (diff)
parent8c3a3e3eaf173d8fbda65d587e83ab1dcf7907c0 (diff)
Merge "Correct ownership of AppSearchPersonTest" am: 8a1d03fe10 am: 03047824e4 am: 8c3a3e3eaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552565 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8423abfaaae68bd25d8d716bbb403bb2c5858668
-rw-r--r--core/tests/coretests/src/android/content/OWNERS1
-rw-r--r--core/tests/coretests/src/android/content/pm/OWNERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/content/OWNERS b/core/tests/coretests/src/android/content/OWNERS
index 696aa11618ff..912db1e835dc 100644
--- a/core/tests/coretests/src/android/content/OWNERS
+++ b/core/tests/coretests/src/android/content/OWNERS
@@ -1,4 +1,3 @@
per-file ContextTest.java = file:/services/core/java/com/android/server/wm/OWNERS
per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS
-per-file AppSearchPersonTest.java = file:/core/java/android/content/pm/SHORTCUT_OWNERS
per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS
diff --git a/core/tests/coretests/src/android/content/pm/OWNERS b/core/tests/coretests/src/android/content/pm/OWNERS
new file mode 100644
index 000000000000..711f5f012b8b
--- /dev/null
+++ b/core/tests/coretests/src/android/content/pm/OWNERS
@@ -0,0 +1,2 @@
+per-file AppSearchPersonTest.java = file:/core/java/android/content/pm/SHORTCUT_OWNERS
+