diff options
| author | 2024-06-14 15:07:22 +0000 | |
|---|---|---|
| committer | 2024-06-14 15:07:22 +0000 | |
| commit | a48127f0276e1fb4e309776b4216160fd5b67e56 (patch) | |
| tree | 5deb160fced1d3d3ea1ba47527882bb11e9e7b9c | |
| parent | db4a586061ef9b083e1e22e5828ec79056ab1a89 (diff) | |
| parent | 9df81febb97f83a304bd660b1107d4fbc09615ec (diff) | |
Merge "Update OWNERS files for power and display services." into main am: 9df81febb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3131156
Change-Id: Ic33453f11bdfd703987a297600abb35e318e7973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/OWNERS | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/hardware/display/OWNERS | 3 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/os/OWNERS | 4 | ||||
| -rw-r--r-- | media/lib/remotedisplay/OWNERS | 2 | ||||
| -rw-r--r-- | services/core/jni/OWNERS | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index 04d49708b6ef..6d6757d5afd1 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -3,9 +3,9 @@ per-file *Vibration* = file:/services/core/java/com/android/server/vibrator/OWNE per-file *Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS # PowerManager -per-file IPowerManager.aidl = michaelwr@google.com, santoscordon@google.com -per-file PowerManager.java = michaelwr@google.com, santoscordon@google.com -per-file PowerManagerInternal.java = michaelwr@google.com, santoscordon@google.com +per-file IPowerManager.aidl = file:/services/core/java/com/android/server/power/OWNERS +per-file PowerManager.java = file:/services/core/java/com/android/server/power/OWNERS +per-file PowerManagerInternal.java = file:/services/core/java/com/android/server/power/OWNERS # BatteryStats per-file *BatteryConsumer* = file:/BATTERY_STATS_OWNERS diff --git a/core/tests/coretests/src/android/hardware/display/OWNERS b/core/tests/coretests/src/android/hardware/display/OWNERS index 9ca391013aa3..3bcb31defe7f 100644 --- a/core/tests/coretests/src/android/hardware/display/OWNERS +++ b/core/tests/coretests/src/android/hardware/display/OWNERS @@ -1,2 +1 @@ -michaelwr@google.com -santoscordon@google.com +file:/services/core/java/com/android/server/display/OWNERS diff --git a/core/tests/coretests/src/android/os/OWNERS b/core/tests/coretests/src/android/os/OWNERS index 8b333f3c3eaa..1c0073417c9a 100644 --- a/core/tests/coretests/src/android/os/OWNERS +++ b/core/tests/coretests/src/android/os/OWNERS @@ -1,11 +1,11 @@ # Display -per-file BrightnessLimit.java = michaelwr@google.com, santoscordon@google.com +per-file BrightnessLimit.java = file:/services/core/java/com/android/server/display/OWNERS # Haptics per-file *Vibrat*.java = file:/services/core/java/com/android/server/vibrator/OWNERS # Power -per-file PowerManager*.java = michaelwr@google.com, santoscordon@google.com +per-file PowerManager*.java = file:/services/core/java/com/android/server/power/OWNERS # PerformanceHintManager per-file PerformanceHintManagerTest.java = file:/ADPF_OWNERS diff --git a/media/lib/remotedisplay/OWNERS b/media/lib/remotedisplay/OWNERS index 7e7335d68d3b..6f6b6249f51a 100644 --- a/media/lib/remotedisplay/OWNERS +++ b/media/lib/remotedisplay/OWNERS @@ -1 +1 @@ -michaelwr@google.com +file:/services/core/java/com/android/server/display/OWNERS
\ No newline at end of file diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS index bce0f856d214..02cba21b8269 100644 --- a/services/core/jni/OWNERS +++ b/services/core/jni/OWNERS @@ -5,8 +5,8 @@ per-file com_android_server_lights_LightsService.cpp = michaelwr@google.com, san per-file com_android_server_input_* = file:/INPUT_OWNERS # Power -per-file com_android_server_HardwarePropertiesManagerService.cpp = michaelwr@google.com, santoscordon@google.com -per-file com_android_server_power_PowerManagerService.* = michaelwr@google.com, santoscordon@google.com +per-file com_android_server_HardwarePropertiesManagerService.cpp = file:/services/core/java/com/android/server/power/OWNERS +per-file com_android_server_power_PowerManagerService.* = file:/services/core/java/com/android/server/power/OWNERS # BatteryStats per-file com_android_server_am_BatteryStatsService.cpp = file:/BATTERY_STATS_OWNERS |