diff options
| author | Michael Wright <michaelwr@google.com> | 2021-02-24 00:10:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 00:10:55 +0000 |
| commit | 916d84985b47fe66ac1e6c4710d339353d9cac95 (patch) | |
| tree | fefcfe05178da06dd3ea93e6c94edc17cbc622da | |
| parent | 76528d53888564f99655365b4bfcce6b1ca5889e (diff) | |
| parent | 471c70287e0924baedcebfe71cced573d23a633e (diff) | |
Merge "Consolidate OWNERS for input" am: 471c70287e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I365e6075c104f327331e08fc642c74d0050c21b5
| -rw-r--r-- | cmds/hid/OWNERS | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/input/OWNERS | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/OWNERS | 6 | ||||
| -rw-r--r-- | data/keyboards/OWNERS | 4 | ||||
| -rw-r--r-- | packages/InputDevices/OWNERS | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/input/OWNERS | 1 |
6 files changed, 7 insertions, 11 deletions
diff --git a/cmds/hid/OWNERS b/cmds/hid/OWNERS new file mode 100644 index 000000000000..d701f23cb9b8 --- /dev/null +++ b/cmds/hid/OWNERS @@ -0,0 +1 @@ +include /core/java/android/hardware/input/OWNERS diff --git a/core/java/android/hardware/input/OWNERS b/core/java/android/hardware/input/OWNERS index 25e02e1aa6f3..c390b33fa174 100644 --- a/core/java/android/hardware/input/OWNERS +++ b/core/java/android/hardware/input/OWNERS @@ -1,6 +1,3 @@ # Bug component: 136048 include /services/core/java/com/android/server/input/OWNERS - -michaelwr@google.com -svv@google.com diff --git a/core/tests/coretests/src/android/view/OWNERS b/core/tests/coretests/src/android/view/OWNERS index 5031ff913e6d..80165f065995 100644 --- a/core/tests/coretests/src/android/view/OWNERS +++ b/core/tests/coretests/src/android/view/OWNERS @@ -1,7 +1,7 @@ # Input -per-file *MotionEventTest.* = michaelwr@google.com, svv@google.com -per-file *KeyEventTest.* = michaelwr@google.com, svv@google.com -per-file VelocityTest.java = michaelwr@google.com, svv@google.com +per-file *MotionEventTest.* = file:/services/core/java/com/android/server/input/OWNERS +per-file *KeyEventTest.* = file:/services/core/java/com/android/server/input/OWNERS +per-file VelocityTest.java = file:/services/core/java/com/android/server/input/OWNERS # WindowManager per-file *Display* = file:/services/core/java/com/android/server/wm/OWNERS diff --git a/data/keyboards/OWNERS b/data/keyboards/OWNERS index c4f6df824a39..0ce83507160c 100644 --- a/data/keyboards/OWNERS +++ b/data/keyboards/OWNERS @@ -1,5 +1,3 @@ set noparent -michaelwr@google.com -svv@google.com -lzye@google.com +include /services/core/java/com/android/server/input/OWNERS diff --git a/packages/InputDevices/OWNERS b/packages/InputDevices/OWNERS index 0313a40f7270..f0d6db88bcc5 100644 --- a/packages/InputDevices/OWNERS +++ b/packages/InputDevices/OWNERS @@ -1,2 +1 @@ -michaelwr@google.com -svv@google.com +include /services/core/java/com/android/server/input/OWNERS diff --git a/services/core/java/com/android/server/input/OWNERS b/services/core/java/com/android/server/input/OWNERS index 0313a40f7270..82c6ee12c7ae 100644 --- a/services/core/java/com/android/server/input/OWNERS +++ b/services/core/java/com/android/server/input/OWNERS @@ -1,2 +1,3 @@ +lzye@google.com michaelwr@google.com svv@google.com |