diff options
| author | 2023-11-18 01:01:33 +0000 | |
|---|---|---|
| committer | 2023-11-18 01:01:33 +0000 | |
| commit | 6a8a8c206050765247642f83070a4ec42ba06e80 (patch) | |
| tree | 29ce626fccc3c5c1f080f04bc17e41d72debfec1 | |
| parent | a8d03fb9dbc005a0d2606d968a24df2fae22f187 (diff) | |
| parent | 6da387677f6693f0b93fdb5b27fa9f9024c6606e (diff) | |
Merge "Update thermal file owner" into main am: 6da387677f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2830554
Change-Id: I0559b4517b2d7917704ace561619f7d7fa9070c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | THERMAL_OWNERS | 3 | ||||
| -rw-r--r-- | core/java/android/os/OWNERS | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/OWNERS | 4 | ||||
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/power/OWNERS | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/power/OWNERS | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/THERMAL_OWNERS b/THERMAL_OWNERS new file mode 100644 index 000000000000..b95b7e84191c --- /dev/null +++ b/THERMAL_OWNERS @@ -0,0 +1,3 @@ +lpy@google.com +wvw@google.com +xwxw@google.com diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index d9a9266cfddc..f2f1bd98ff5d 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -83,3 +83,7 @@ per-file ArtModuleServiceManager.java = file:platform/art:/OWNERS # PerformanceHintManager per-file PerformanceHintManager.java = file:/ADPF_OWNERS + +# IThermal interfaces +per-file IThermal* = file:/THERMAL_OWNERS + diff --git a/services/core/java/com/android/server/power/OWNERS b/services/core/java/com/android/server/power/OWNERS index 1970ee4b4463..94340ec26cba 100644 --- a/services/core/java/com/android/server/power/OWNERS +++ b/services/core/java/com/android/server/power/OWNERS @@ -2,6 +2,6 @@ michaelwr@google.com santoscordon@google.com philipjunker@google.com -per-file ThermalManagerService.java=wvw@google.com +per-file ThermalManagerService.java=file:/THERMAL_OWNERS per-file LowPowerStandbyController.java=qingxun@google.com -per-file LowPowerStandbyControllerInternal.java=qingxun@google.com
\ No newline at end of file +per-file LowPowerStandbyControllerInternal.java=qingxun@google.com diff --git a/services/tests/mockingservicestests/src/com/android/server/power/OWNERS b/services/tests/mockingservicestests/src/com/android/server/power/OWNERS index fb62520ff57b..37396f392551 100644 --- a/services/tests/mockingservicestests/src/com/android/server/power/OWNERS +++ b/services/tests/mockingservicestests/src/com/android/server/power/OWNERS @@ -1,3 +1,3 @@ include /services/core/java/com/android/server/power/OWNERS -per-file ThermalManagerServiceMockingTest.java=wvw@google.com,xwxw@google.com +per-file ThermalManagerServiceMockingTest.java=file:/THERMAL_OWNERS diff --git a/services/tests/servicestests/src/com/android/server/power/OWNERS b/services/tests/servicestests/src/com/android/server/power/OWNERS index ef4c0bf71cd7..fe93ebbf3d8c 100644 --- a/services/tests/servicestests/src/com/android/server/power/OWNERS +++ b/services/tests/servicestests/src/com/android/server/power/OWNERS @@ -1,3 +1,3 @@ include /services/core/java/com/android/server/power/OWNERS -per-file ThermalManagerServiceTest.java=wvw@google.com, xwxw@google.com
\ No newline at end of file +per-file ThermalManagerServiceTest.java=file:/THERMAL_OWNERS |