diff options
| author | 2024-11-06 20:51:31 +0000 | |
|---|---|---|
| committer | 2024-11-06 20:51:31 +0000 | |
| commit | 21c807297acf5d8b53ca51e2d1dfc02f2b7986c3 (patch) | |
| tree | 8513ef87a5768bd0490ed83cab0b62416b90ea43 | |
| parent | 403de724a12cb69f6a9959c38b605059920c5f89 (diff) | |
| parent | 06f56817d48c2d63301e73159019a261aee84562 (diff) | |
Merge "Add ACTIVITY_SECURITY_OWNERS to ActivityManager* and ActivityStartController.java" into main
| -rw-r--r-- | services/core/java/com/android/server/am/OWNERS | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/OWNERS | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS index 2a30ad0e0f3f..6f99673a9ce6 100644 --- a/services/core/java/com/android/server/am/OWNERS +++ b/services/core/java/com/android/server/am/OWNERS @@ -61,6 +61,9 @@ per-file *Oom* = file:/OOM_ADJUSTER_OWNERS per-file SettingsToPropertiesMapper.java = omakoto@google.com, yamasani@google.com, dzshen@google.com, zhidou@google.com, tedbauer@google.com per-file CarUserSwitchingDialog.java = file:platform/packages/services/Car:/OWNERS +# Activity Security +per-file ActivityManager* = file:/ACTIVITY_SECURITY_OWNERS + # Londoners michaelwr@google.com #{LAST_RESORT_SUGGESTION} narayan@google.com #{LAST_RESORT_SUGGESTION} diff --git a/services/core/java/com/android/server/wm/OWNERS b/services/core/java/com/android/server/wm/OWNERS index 431023163d0a..63cd59e45ea6 100644 --- a/services/core/java/com/android/server/wm/OWNERS +++ b/services/core/java/com/android/server/wm/OWNERS @@ -34,4 +34,5 @@ per-file *TransitionTracer.java = file:platform/development:/tools/winscope/OWNE # Files related to activity security per-file ActivityStarter.java = file:/ACTIVITY_SECURITY_OWNERS +per-file ActivityStartController.java = file:/ACTIVITY_SECURITY_OWNERS per-file ActivityTaskManagerService.java = file:/ACTIVITY_SECURITY_OWNERS |