3
0
Fork 0

Merge changes I2b4d2763,Ieeb40d03 into main am: 42ebed4a2f am: 148ddb9fd9

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

Change-Id: I02ce439c3052c557f471366fae8fd438ba7a73c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Strathearn 2024-09-20 18:29:43 +00:00 committed by Automerger Merge Worker
commit ef61a0eb82
9 changed files with 84 additions and 37 deletions

4
ACTIVITY_MANAGER_OWNERS Normal file
View File

@ -0,0 +1,4 @@
mwachens@google.com
sudheersai@google.com
varunshah@google.com
yamasani@google.com

View File

@ -1,4 +1,3 @@
# OWNERS of BatteryStats related files
bookatz@google.com
dplotnikov@google.com
mwachens@google.com

3
OOM_ADJUSTER_OWNERS Normal file
View File

@ -0,0 +1,3 @@
mwachens@google.com
dplotnikov@google.com
tyk@google.com

View File

@ -0,0 +1,2 @@
suprabh@google.com
tetianameronyk@google.com

View File

@ -0,0 +1,2 @@
suprabh@google.com
guanxin@google.com

View File

@ -0,0 +1,3 @@
suprabh@google.com
varunshah@google.com
guanxin@google.com

View File

@ -1,8 +1,25 @@
ctate@android.com
ctate@google.com
dplotnikov@google.com
jji@google.com
omakoto@google.com
suprabh@google.com
varunshah@google.com
yamasani@google.com
# For Job Scheduler and App Standby changes, JOB_OWNERS
per-file JOB_OWNERS = file:/apex/jobscheduler/JOB_OWNERS
per-file framework/aconfig/job.aconfig = file:/apex/jobscheduler/JOB_OWNERS
per-file service/aconfig/job.aconfig = file:/apex/jobscheduler/JOB_OWNERS
per-file service/aconfig/app_idle.aconfig = file:/apex/jobscheduler/JOB_OWNERS
per-file *Job* = file:/apex/jobscheduler/JOB_OWNERS
per-file *Standby* = file:/apex/jobscheduler/JOB_OWNERS
per-file framework/java/android/app/job/* = file:/apex/jobscheduler/JOB_OWNERS
per-file framework/java/com/android/server/job/* = file:/apex/jobscheduler/JOB_OWNERS
per-file service/java/com/android/server/job/* = file:/apex/jobscheduler/JOB_OWNERS
# For Alarm Manager changes, ALARM_OWNERS
per-file ALARM_OWNERS = file:/apex/jobscheduler/ALARM_OWNERS
per-file service/aconfig/alarm.aconfig = file:/apex/jobscheduler/ALARM_OWNERS
per-file *Alarm* = file:/apex/jobscheduler/ALARM_OWNERS
per-file service/java/com/android/server/alarm/* = file:/apex/jobscheduler/ALARM_OWNERS
# For Device Idle changes, DEVICE_IDLE_OWNERS
per-file DEVICE_IDLE_OWNERS = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
per-file service/aconfig/device_idle.aconfig = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
per-file *Idle* = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
per-file service/java/com/android/server/deviceidle/* = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
per-file framework/java/com/android/server/deviceidle/* = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
suprabh@google.com #{LAST_RESORT_SUGGESTION}

View File

@ -1,6 +0,0 @@
# Bug component: 330738
yamasani@google.com
omakoto@google.com
ctate@android.com
ctate@google.com

View File

@ -1,16 +1,24 @@
# Applications & Processes
yamasani@google.com
jsharkey@google.com
hackbod@google.com
omakoto@google.com
ctate@google.com
huiyu@google.com
mwachens@google.com
sudheersai@google.com
suprabh@google.com
varunshah@google.com
bookatz@google.com
jji@google.com
per-file ActivityManager* = file:/ACTIVITY_MANAGER_OWNERS
per-file ActiveServices.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessList.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ActivityThread.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file SystemServer.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ServiceRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file AppProfiler.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessStateRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessServiceRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ForegroundServiceTypeLoggerModule.java = file:/ACTIVITY_MANAGER_OWNERS
per-file AppRestrictionController.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessErrorStateRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ProcessProfileRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file ConnectionRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file UidRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file IntentBindRecord.java = file:/ACTIVITY_MANAGER_OWNERS
per-file AppFGSTracker.java = file:/ACTIVITY_MANAGER_OWNERS
per-file FgsTempAllowList.java = file:/ACTIVITY_MANAGER_OWNERS
per-file HostingRecord.java = file:/ACTIVITY_MANAGER_OWNERS
# Windows & Activities
ogunwale@google.com
@ -20,24 +28,19 @@ patb@google.com
per-file AccessCheckDelegateHelper.java = file:/core/java/android/permission/OWNERS
# Battery Stats
joeo@google.com
per-file AppBatteryTracker.java = file:/BATTERY_STATS_OWNERS
per-file BatteryStats* = file:/BATTERY_STATS_OWNERS
per-file BatteryExternalStats* = file:/BATTERY_STATS_OWNERS
# Londoners
michaelwr@google.com
narayan@google.com
# Voice Interaction
per-file *Assist* = file:/core/java/android/service/voice/OWNERS
per-file *Voice* = file:/core/java/android/service/voice/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
per-file ContentProviderHelper.java = varunshah@google.com, omakoto@google.com, jsharkey@google.com, yamasani@google.com
# Content Provider
per-file ContentProvider* = varunshah@google.com, yamasani@google.com
# Cached App Freezer
per-file ProcessCachedOptimizerRecord.java = file:/PERFORMANCE_OWNERS
per-file CachedAppOptimizer.java = file:/PERFORMANCE_OWNERS
per-file Freezer.java = file:/PERFORMANCE_OWNERS
@ -46,3 +49,23 @@ per-file User* = file:/MULTIUSER_OWNERS
# Broadcasts
per-file Broadcast* = file:/BROADCASTS_OWNERS
# Permissions & Packages
per-file *Permission* = patb@google.com
per-file *Package* = patb@google.com
# OOM Adjuster
per-file *Oom* = file:/OOM_ADJUSTER_OWNERS
# Miscellaneous
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
# Londoners
michaelwr@google.com #{LAST_RESORT_SUGGESTION}
narayan@google.com #{LAST_RESORT_SUGGESTION}
# Default
hackbod@google.com #{LAST_RESORT_SUGGESTION}
omakoto@google.com #{LAST_RESORT_SUGGESTION}
yamasani@google.com #{LAST_RESORT_SUGGESTION}