diff options
| author | 2023-12-20 20:52:23 +0000 | |
|---|---|---|
| committer | 2023-12-20 20:52:23 +0000 | |
| commit | 18d62bfc54d0c159a2bb9ba22492b1cce89c8743 (patch) | |
| tree | b5f1e43c4c79d298ea498d8d289e14039aa676fb | |
| parent | a96aa0c435694865f91564d8ff2cc5d94bce8381 (diff) | |
| parent | 500e9a5bbd56a9193c4b45ed654066ef209bd70b (diff) | |
Merge "Merge "Add SECURITY_STATE_OWNERS file for Security State files." into main am: 31b247f8e5 am: af5df7224e am: 238f9a07a7" into main
| -rw-r--r-- | SECURITY_STATE_OWNERS | 5 | ||||
| -rw-r--r-- | core/java/android/os/OWNERS | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/OWNERS | 1 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/OWNERS | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/SECURITY_STATE_OWNERS b/SECURITY_STATE_OWNERS new file mode 100644 index 000000000000..30ddfe2bebe8 --- /dev/null +++ b/SECURITY_STATE_OWNERS @@ -0,0 +1,5 @@ +alxu@google.com +musashi@google.com +maunik@google.com +davidkwak@google.com +willcoster@google.com
\ No newline at end of file diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index 209a59583944..d3f2c7ae6e42 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -92,3 +92,6 @@ per-file PerformanceHintManager.java = file:/ADPF_OWNERS per-file IThermal* = file:/THERMAL_OWNERS per-file CoolingDevice.java = file:/THERMAL_OWNERS per-file Temperature.java = file:/THERMAL_OWNERS + +# SecurityStateManager +per-file *SecurityStateManager* = file:/SECURITY_STATE_OWNERS
\ No newline at end of file diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index c258370dc12b..e289a56f5dc5 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -27,6 +27,7 @@ per-file **IpSec* = file:/services/core/java/com/android/server/net/OWNERS per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS per-file *Location* = file:/services/core/java/com/android/server/location/OWNERS per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS +per-file *SecurityStateManager* = file:/SECURITY_STATE_OWNERS per-file *SoundTrigger* = file:/media/java/android/media/soundtrigger/OWNERS per-file *Storage* = file:/core/java/android/os/storage/OWNERS per-file *TimeUpdate* = file:/services/core/java/com/android/server/timezonedetector/OWNERS diff --git a/services/tests/servicestests/src/com/android/server/OWNERS b/services/tests/servicestests/src/com/android/server/OWNERS index 2d36ff311d4f..d49bc4326a5a 100644 --- a/services/tests/servicestests/src/com/android/server/OWNERS +++ b/services/tests/servicestests/src/com/android/server/OWNERS @@ -7,3 +7,4 @@ per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS per-file BatteryServiceTest.java = file:platform/hardware/interfaces:/health/OWNERS per-file GestureLauncherServiceTest.java = file:platform/packages/apps/EmergencyInfo:/OWNERS per-file PinnerServiceTest.java = file:/apct-tests/perftests/OWNERS +per-file SecurityStateTest.java = file:/SECURITY_STATE_OWNERS |