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
diff --git a/apct-tests/perftests/multiuser/OWNERS b/apct-tests/perftests/multiuser/OWNERS
new file mode 100644
index 0000000..1a206cb
--- /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 c804e642..6d79e2d 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -39,6 +39,9 @@
# 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 f88df95..fd32efc 100644
--- a/core/java/android/content/pm/OWNERS
+++ b/core/java/android/content/pm/OWNERS
@@ -7,3 +7,4 @@
per-file PackageParser.java = [email protected]
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 8c77a20..6c49b36 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -22,6 +22,10 @@
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 5efd0bd..9867d81 100644
--- a/data/etc/OWNERS
+++ b/data/etc/OWNERS
@@ -11,3 +11,5 @@
[email protected]
[email protected]
[email protected]
+
+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 48f6bf8..a52e9cf 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
[email protected]
diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS
index 004259b..43c5d5e 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 CrossProfileAppsService.java = [email protected], [email protected]
per-file CrossProfileIntentFilter.java = [email protected], [email protected]
per-file CrossProfileIntentResolver.java = [email protected], [email protected]
-per-file RestrictionsSet.java = [email protected], [email protected], [email protected], [email protected], [email protected]
-per-file UserManagerInternal.java = [email protected], [email protected], [email protected]
-per-file UserManagerService.java = [email protected], [email protected], [email protected]
-per-file UserRestrictionsUtils.java = [email protected], [email protected], [email protected], [email protected]
-per-file UserSystemPackageInstaller.java = [email protected], [email protected], [email protected]
-per-file UserTypeDetails.java = [email protected], [email protected], [email protected]
-per-file UserTypeFactory.java = [email protected], [email protected], [email protected]
+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 = [email protected], [email protected]
