diff options
| author | 2024-11-06 21:37:37 +0000 | |
|---|---|---|
| committer | 2024-11-06 21:37:37 +0000 | |
| commit | 1a3db2ed5fe7b02b024bd194fe3c1274b6df6451 (patch) | |
| tree | a8d849f3a9ddd7854cd2fabc1fb2f50cc78459d5 | |
| parent | 25b14313aea268a98ae1151fb1dd5b6420351a40 (diff) | |
| parent | 21c807297acf5d8b53ca51e2d1dfc02f2b7986c3 (diff) | |
Merge "Add ACTIVITY_SECURITY_OWNERS to ActivityManager* and ActivityStartController.java" into main am: 21c807297a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3326777
Change-Id: I3a894b09f435e276419ff6bf8f8bac71bbff1ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |