diff options
| author | 2024-10-28 19:15:28 +0000 | |
|---|---|---|
| committer | 2024-10-28 19:15:28 +0000 | |
| commit | 9917c9c74d046e0e43c80a1f33c9ecb46b41926c (patch) | |
| tree | 1b6477303d44df285a9f21260e49f4638d2ce063 | |
| parent | 9480c4e7654d8afb13bb854504562c08f36fce2f (diff) | |
| parent | 78fd8733745d6fd4a50063535df7c0b170ab58bc (diff) | |
Merge "Merge "Add ACTIVITY_SECURITY_OWNERS." into main am: 7d00da340e am: 5e8283b626" into main
| -rw-r--r-- | ACTIVITY_SECURITY_OWNERS | 2 | ||||
| -rw-r--r-- | INTENT_OWNERS | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/OWNERS | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/ACTIVITY_SECURITY_OWNERS b/ACTIVITY_SECURITY_OWNERS new file mode 100644 index 000000000000..c39842e1b7a3 --- /dev/null +++ b/ACTIVITY_SECURITY_OWNERS @@ -0,0 +1,2 @@ +haok@google.com +wnan@google.com
\ No newline at end of file diff --git a/INTENT_OWNERS b/INTENT_OWNERS index 58b5f2a61be0..c828215ef225 100644 --- a/INTENT_OWNERS +++ b/INTENT_OWNERS @@ -1,3 +1,4 @@ include /PACKAGE_MANAGER_OWNERS include /services/core/java/com/android/server/wm/OWNERS include /services/core/java/com/android/server/am/OWNERS +include /ACTIVITY_SECURITY_OWNERS
\ No newline at end of file diff --git a/services/core/java/com/android/server/wm/OWNERS b/services/core/java/com/android/server/wm/OWNERS index 5d6d8bcc579f..e983edf0d5ae 100644 --- a/services/core/java/com/android/server/wm/OWNERS +++ b/services/core/java/com/android/server/wm/OWNERS @@ -32,3 +32,7 @@ per-file ActivityCallerState.java = file:/core/java/android/app/COMPONENT_CALLER # Files related to tracing per-file *TransitionTracer.java = file:platform/development:/tools/winscope/OWNERS per-file *WindowTracing* = file:platform/development:/tools/winscope/OWNERS + +# Files related to activity security +per-file ActivityStarter.java = file:/ACTIVITY_SECURITY_OWNERS +per-file ActivityTaskManagerService.java = file:/ACTIVITY_SECURITY_OWNERS |