summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2025-01-02 12:42:29 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-02 12:42:29 -0800
commit60e124646393522e0c60f6389878a7e77f4615a1 (patch)
treefc832224a19042cff80581c0741b200e453b960e
parent579be20a7e183e32f14f3b1b7c2478e0d1f098a6 (diff)
parenta1a8db6c3c21b223e74ff6ef422bee434c76ce7f (diff)
Merge "Update ownership for UidObserver related classes." into main am: 4514061228 am: a1a8db6c3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3431101 Change-Id: I39c63e63e3f551dcf3c48040f9c89167d3a6eb16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/app/OWNERS1
-rw-r--r--services/core/java/com/android/server/am/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
index 6e4c28f3eca6..7a811a1cdfb8 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -28,6 +28,7 @@ per-file ProfilerInfo* = file:/ACTIVITY_MANAGER_OWNERS
per-file Service* = file:/ACTIVITY_MANAGER_OWNERS
per-file SystemServiceRegistry.java = file:/ACTIVITY_MANAGER_OWNERS
per-file *UserSwitchObserver* = file:/ACTIVITY_MANAGER_OWNERS
+per-file UidObserver* = file:/ACTIVITY_MANAGER_OWNERS
# UI Automation
per-file *UiAutomation* = file:/services/accessibility/OWNERS
diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS
index 1a6051b6ac9c..cc6fabc8fd67 100644
--- a/services/core/java/com/android/server/am/OWNERS
+++ b/services/core/java/com/android/server/am/OWNERS
@@ -21,6 +21,7 @@ per-file FgsTempAllowList.java = file:/ACTIVITY_MANAGER_OWNERS
per-file HostingRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file App*ExitInfo* = file:/ACTIVITY_MANAGER_OWNERS
per-file appexitinfo.proto = file:/ACTIVITY_MANAGER_OWNERS
+per-file UidObserverController* = file:/ACTIVITY_MANAGER_OWNERS
per-file App*StartInfo* = file:/PERFORMANCE_OWNERS
per-file appstartinfo.proto = file:/PERFORMANCE_OWNERS