diff options
| author | 2022-05-18 19:18:41 +0000 | |
|---|---|---|
| committer | 2022-05-18 19:18:41 +0000 | |
| commit | 8992cd567fbc809a63ec590c70d587640834d820 (patch) | |
| tree | d94b78efb58433dcdaad660054ef6082749cf04e | |
| parent | e29e536b0f0421b9882ae48894dfc3ffd81b723c (diff) | |
| parent | 7845f672bfbf179f4ea3a48fcff36d7f615a73eb (diff) | |
Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015
Change-Id: I0316c2bc2f120d9a6534758b49595a36c57f9158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | INPUT_OWNERS | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/input/OWNERS | 4 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/OWNERS | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/input/OWNERS | 4 | ||||
| -rw-r--r-- | services/core/jni/OWNERS | 6 | ||||
| -rw-r--r-- | tools/validatekeymaps/OWNERS | 3 |
6 files changed, 7 insertions, 13 deletions
diff --git a/INPUT_OWNERS b/INPUT_OWNERS index 6041f637f9c1..051216fdf3c6 100644 --- a/INPUT_OWNERS +++ b/INPUT_OWNERS @@ -1,3 +1,4 @@ +# Bug component: 136048 michaelwr@google.com prabirmsp@google.com svv@google.com diff --git a/core/java/android/hardware/input/OWNERS b/core/java/android/hardware/input/OWNERS index c390b33fa174..4c20c4dc9d35 100644 --- a/core/java/android/hardware/input/OWNERS +++ b/core/java/android/hardware/input/OWNERS @@ -1,3 +1 @@ -# Bug component: 136048 - -include /services/core/java/com/android/server/input/OWNERS +include /INPUT_OWNERS diff --git a/core/java/com/android/internal/widget/OWNERS b/core/java/com/android/internal/widget/OWNERS index 8e68be0f742a..d068a3a0f62e 100644 --- a/core/java/com/android/internal/widget/OWNERS +++ b/core/java/com/android/internal/widget/OWNERS @@ -1,4 +1,4 @@ -per-file PointerLocationView.java = michaelwr@google.com, svv@google.com +per-file PointerLocationView.java = file:/INPUT_OWNERS per-file RecyclerView.java = mount@google.com per-file ViewPager.java = mount@google.com diff --git a/services/core/java/com/android/server/input/OWNERS b/services/core/java/com/android/server/input/OWNERS index 82c6ee12c7ae..4c20c4dc9d35 100644 --- a/services/core/java/com/android/server/input/OWNERS +++ b/services/core/java/com/android/server/input/OWNERS @@ -1,3 +1 @@ -lzye@google.com -michaelwr@google.com -svv@google.com +include /INPUT_OWNERS diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS index 51bc99a693ff..85671105ec25 100644 --- a/services/core/jni/OWNERS +++ b/services/core/jni/OWNERS @@ -2,7 +2,7 @@ per-file com_android_server_lights_LightsService.cpp = michaelwr@google.com, santoscordon@google.com # Input -per-file com_android_server_input_InputManagerService.cpp = michaelwr@google.com, svv@google.com +per-file com_android_server_input_* = file:/INPUT_OWNERS # Power per-file com_android_server_HardwarePropertiesManagerService.cpp = michaelwr@google.com, santoscordon@google.com @@ -15,7 +15,6 @@ per-file Android.bp = file:platform/build/soong:/OWNERS per-file com_android_server_Usb* = file:/services/usb/OWNERS per-file com_android_server_Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS per-file com_android_server_hdmi_* = file:/core/java/android/hardware/hdmi/OWNERS -per-file com_android_server_input_* = file:/core/java/android/hardware/input/OWNERS per-file com_android_server_lights_* = file:/services/core/java/com/android/server/lights/OWNERS 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 @@ -23,8 +22,7 @@ per-file com_android_server_net_* = file:/services/core/java/com/android/server/ 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 -per-file com_android_server_se_* = file:/core/java/android/se/OWNERS per-file com_android_server_security_* = file:/core/java/android/security/OWNERS per-file com_android_server_tv_* = file:/media/java/android/media/tv/OWNERS per-file com_android_server_vibrator_* = file:/services/core/java/com/android/server/vibrator/OWNERS -per-file com_android_server_am_CachedAppOptimizer.cpp = timmurray@google.com, edgararriaga@google.com, dualli@google.com, carmenjackson@google.com, philipcuadra@google.com
\ No newline at end of file +per-file com_android_server_am_CachedAppOptimizer.cpp = timmurray@google.com, edgararriaga@google.com, dualli@google.com, carmenjackson@google.com, philipcuadra@google.com diff --git a/tools/validatekeymaps/OWNERS b/tools/validatekeymaps/OWNERS index 0313a40f7270..4c20c4dc9d35 100644 --- a/tools/validatekeymaps/OWNERS +++ b/tools/validatekeymaps/OWNERS @@ -1,2 +1 @@ -michaelwr@google.com -svv@google.com +include /INPUT_OWNERS |