summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-11-18 00:29:44 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-11-18 00:29:44 +0000
commit6da387677f6693f0b93fdb5b27fa9f9024c6606e (patch)
tree186dbf8a1893e595148527b09455bac3fbe5895a
parentf580f13013559ddb682e1a9e36171e578412bfcb (diff)
parent6746102581e0e9340cdbbd82d3aa30cb51d991e6 (diff)
Merge "Update thermal file owner" into main
-rw-r--r--THERMAL_OWNERS3
-rw-r--r--core/java/android/os/OWNERS4
-rw-r--r--services/core/java/com/android/server/power/OWNERS4
-rw-r--r--services/tests/mockingservicestests/src/com/android/server/power/OWNERS2
-rw-r--r--services/tests/servicestests/src/com/android/server/power/OWNERS2
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