Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3db2ed authored by Hao Ke's avatar Hao Ke Committed by Automerger Merge Worker
Browse files

Merge "Add ACTIVITY_SECURITY_OWNERS to ActivityManager* and... 

Merge "Add ACTIVITY_SECURITY_OWNERS to ActivityManager* and ActivityStartController.java" into main am: 21c80729

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3326777



Change-Id: I3a894b09f435e276419ff6bf8f8bac71bbff1ad5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25b14313 21c80729

services/core/java/com/android/server/am/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -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}

services/core/java/com/android/server/wm/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -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