From 6cd4cd01fba48b551c0cd0e1ef028ae91800b0e9 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Mon, 11 Jan 2021 12:04:13 -0800 Subject: [PATCH] Add User* OWNERS file (part 2) Part 1 was aosp/1546301. Two parts are required due to b/175318571. Test: N/A Change-Id: I1a89f7d26da70dce36d1e891a8e8ebc4042dc56c --- apct-tests/perftests/multiuser/OWNERS | 1 + core/java/android/app/OWNERS | 3 +++ core/java/android/content/pm/OWNERS | 1 + core/java/android/os/OWNERS | 4 ++++ data/etc/OWNERS | 2 ++ .../server/pm/MULTIUSER_AND_ENTERPRISE_OWNERS | 2 +- services/core/java/com/android/server/pm/OWNERS | 13 ++++++------- 7 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 apct-tests/perftests/multiuser/OWNERS diff --git a/apct-tests/perftests/multiuser/OWNERS b/apct-tests/perftests/multiuser/OWNERS new file mode 100644 index 0000000000000..1a206cb27c3bb --- /dev/null +++ b/apct-tests/perftests/multiuser/OWNERS @@ -0,0 +1 @@ +include /MULTIUSER_OWNERS \ No newline at end of file diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS index c804e6427dcec..6d79e2d3c1668 100644 --- a/core/java/android/app/OWNERS +++ b/core/java/android/app/OWNERS @@ -39,6 +39,9 @@ per-file *Alarm* = file:/apex/jobscheduler/OWNERS # AppOps per-file *AppOp* = file:/core/java/android/permission/OWNERS +# Multiuser +per-file *User* = file:/MULTIUSER_OWNERS + # Notification per-file *Notification* = file:/packages/SystemUI/OWNERS diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS index f88df958d8277..fd32efccbcec5 100644 --- a/core/java/android/content/pm/OWNERS +++ b/core/java/android/content/pm/OWNERS @@ -7,3 +7,4 @@ patb@google.com per-file PackageParser.java = chiuwinson@google.com per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS +per-file UserInfo* = file:/MULTIUSER_OWNERS diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index 8c77a20999757..6c49b365c4f3a 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -22,6 +22,10 @@ per-file BatteryStats* = file:/BATTERY_STATS_OWNERS per-file BatteryUsageStats* = file:/BATTERY_STATS_OWNERS per-file PowerComponents.java = file:/BATTERY_STATS_OWNERS +# Multiuser +per-file IUser* = file:/MULTIUSER_OWNERS +per-file User* = file:/MULTIUSER_OWNERS + # Binder per-file BadParcelableException.java = file:platform/frameworks/native:/libs/binder/OWNERS per-file Binder.java = file:platform/frameworks/native:/libs/binder/OWNERS diff --git a/data/etc/OWNERS b/data/etc/OWNERS index 5efd0bd06b74e..9867d810dba29 100644 --- a/data/etc/OWNERS +++ b/data/etc/OWNERS @@ -11,3 +11,5 @@ svetoslavganov@google.com toddke@android.com toddke@google.com yamasani@google.com + +per-file preinstalled-packages* = file:/MULTIUSER_OWNERS \ No newline at end of file diff --git a/services/core/java/com/android/server/pm/MULTIUSER_AND_ENTERPRISE_OWNERS b/services/core/java/com/android/server/pm/MULTIUSER_AND_ENTERPRISE_OWNERS index 48f6bf84c28b9..a52e9cf2f4c30 100644 --- a/services/core/java/com/android/server/pm/MULTIUSER_AND_ENTERPRISE_OWNERS +++ b/services/core/java/com/android/server/pm/MULTIUSER_AND_ENTERPRISE_OWNERS @@ -1,6 +1,6 @@ # OWNERS of Multiuser related files related to Enterprise -# TODO: include /MULTIUSER_OWNERS +include /MULTIUSER_OWNERS # Enterprise owners rubinxu@google.com diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS index 004259b7478c8..43c5d5e4015e2 100644 --- a/services/core/java/com/android/server/pm/OWNERS +++ b/services/core/java/com/android/server/pm/OWNERS @@ -30,13 +30,12 @@ per-file CrossProfileAppsServiceImpl.java = omakoto@google.com, yamasani@google. per-file CrossProfileAppsService.java = omakoto@google.com, yamasani@google.com per-file CrossProfileIntentFilter.java = omakoto@google.com, yamasani@google.com per-file CrossProfileIntentResolver.java = omakoto@google.com, yamasani@google.com -per-file RestrictionsSet.java = bookatz@google.com, omakoto@google.com, yamasani@google.com, rubinxu@google.com, sandness@google.com -per-file UserManagerInternal.java = bookatz@google.com, omakoto@google.com, yamasani@google.com -per-file UserManagerService.java = bookatz@google.com, omakoto@google.com, yamasani@google.com -per-file UserRestrictionsUtils.java = omakoto@google.com, rubinxu@google.com, sandness@google.com, yamasani@google.com -per-file UserSystemPackageInstaller.java = bookatz@google.com, omakoto@google.com, yamasani@google.com -per-file UserTypeDetails.java = bookatz@google.com, omakoto@google.com, yamasani@google.com -per-file UserTypeFactory.java = bookatz@google.com, omakoto@google.com, yamasani@google.com +per-file RestrictionsSet.java = file:MULTIUSER_AND_ENTERPRISE_OWNERS +per-file UserManager* = file:/MULTIUSER_OWNERS +per-file UserRestriction* = file:MULTIUSER_AND_ENTERPRISE_OWNERS +per-file UserSystemPackageInstaller* = file:/MULTIUSER_OWNERS +per-file UserTypeDetails.java = file:/MULTIUSER_OWNERS +per-file UserTypeFactory.java = file:/MULTIUSER_OWNERS # security per-file KeySetHandle.java = cbrubaker@google.com, nnk@google.com