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

Commit 78fd8733 authored by Hao Ke's avatar Hao Ke
Browse files

Merge "Add ACTIVITY_SECURITY_OWNERS." into main am: 7d00da34 am: 5e8283b6

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



Change-Id: I462a65b34b5c331bc379a7888f34e7365f457b16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Test: only changing OWNERS
Flag: EXEMPT only changing OWNERS
parents 7392d888 5e8283b6
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
haok@google.com
wnan@google.com
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
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
+4 −0
Original line number Diff line number Diff line
@@ -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