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

Commit 10b71d0d 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 am: 1a3db2ed

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



Change-Id: I7e4b6c70eadf3e119adfb08559b9b6daab752cfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da0d6b68 1a3db2ed

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

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ per-file ProcessStateController.java = 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
@@ -35,4 +35,5 @@ per-file *WindowTracing* = file:platform/development:/tools/winscope/OWNERS 


# 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