Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089 Change-Id: I9a93b5518d438d87b3f7da1871421f6cf3719590
2021-05-18 22:45:49 +00:00
parent 06dacb662c 1ef34e9022
commit 4c56bac295
15 changed files with 18 additions and 6 deletions
--- a/cmds/idmap2/OWNERS
+++ b/cmds/idmap2/OWNERS
@@ -1,3 +1,4 @@
 set noparent
 toddke@google.com
-rtmitchell@google.com
+rtmitchell@google.com
 patb@google.com
--- a/core/java/android/app/RESOURCES_OWNERS
+++ b/core/java/android/app/RESOURCES_OWNERS
@@ -1,2 +1,3 @@
 rtmitchell@google.com
 toddke@google.com
 patb@google.com
--- a/core/java/android/os/incremental/OWNERS
+++ b/core/java/android/os/incremental/OWNERS
@@ -3,3 +3,4 @@ alexbuy@google.com
 schfan@google.com
 toddke@google.com
 zyy@google.com
 patb@google.com
--- a/core/java/com/android/server/OWNERS
+++ b/core/java/com/android/server/OWNERS
@@ -1 +1 @@
-per-file SystemConfig.java = toddke@google.com
+per-file SystemConfig.java = toddke@google.com,patb@google.com
--- a/core/proto/OWNERS
+++ b/core/proto/OWNERS
@@ -16,7 +16,7 @@ ogunwale@google.com
 jjaggi@google.com
 kwekua@google.com
 roosa@google.com
-per-file package_item_info.proto = toddke@google.com
+per-file package_item_info.proto = toddke@google.com,patb@google.com
 per-file usagestatsservice.proto, usagestatsservice_v2.proto = file:/core/java/android/app/usage/OWNERS
 per-file apphibernationservice.proto = file:/core/java/android/apphibernation/OWNERS
--- a/data/etc/OWNERS
+++ b/data/etc/OWNERS
@@ -10,6 +10,7 @@ svetoslavganov@android.com
 svetoslavganov@google.com
 toddke@android.com
 toddke@google.com
 patb@google.com
 yamasani@google.com
 per-file preinstalled-packages* = file:/MULTIUSER_OWNERS
--- a/libs/androidfw/OWNERS
+++ b/libs/androidfw/OWNERS
@@ -1,6 +1,7 @@
 set noparent
 toddke@google.com
 rtmitchell@google.com
 patb@google.com
 per-file CursorWindow.cpp=omakoto@google.com
 per-file LocaleDataTables.cpp=vichang@google.com,ngeoffray@google.com,nikitai@google.com
--- a/packages/CtsShim/OWNERS
+++ b/packages/CtsShim/OWNERS
@@ -1,2 +1,3 @@
 ioffe@google.com
-toddke@google.com
+toddke@google.com
 patb@google.com
--- a/packages/PackageInstaller/OWNERS
+++ b/packages/PackageInstaller/OWNERS
@@ -1,5 +1,6 @@
 svetoslavganov@google.com
 toddke@google.com
 patb@google.com
 suprabh@google.com
 # For automotive related changes
--- a/packages/SettingsProvider/OWNERS
+++ b/packages/SettingsProvider/OWNERS
@@ -4,3 +4,4 @@ narayan@google.com
 svetoslavganov@google.com
 schfan@google.com
 toddke@google.com
 patb@google.com
--- a/packages/Shell/OWNERS
+++ b/packages/Shell/OWNERS
@@ -7,6 +7,7 @@ svetoslavganov@google.com
 hackbod@google.com
 yamasani@google.com
 toddke@google.com
 patb@google.com
 cbrubaker@google.com
 omakoto@google.com
 michaelwr@google.com
--- a/services/OWNERS
+++ b/services/OWNERS
@@ -3,4 +3,4 @@ per-file Android.bp = file:platform/build/soong:/OWNERS
 # art-team@ manages the system server profile
 per-file art-profile* = calin@google.com, mathieuc@google.com, ngeoffray@google.com
-per-file java/com/android/server/* = toddke@google.com
+per-file java/com/android/server/* = toddke@google.com,patb@google.com
--- a/services/core/java/com/android/server/am/OWNERS
+++ b/services/core/java/com/android/server/am/OWNERS
@@ -20,6 +20,7 @@ ogunwale@google.com
 # Permissions & Packages
 svetoslavganov@google.com
 toddke@google.com
 patb@google.com
 # Battery Stats
 joeo@google.com
--- a/services/incremental/OWNERS
+++ b/services/incremental/OWNERS
@@ -5,3 +5,4 @@ alexbuy@google.com
 schfan@google.com
 toddke@google.com
 zyy@google.com
 patb@google.com
--- a/tools/aapt2/OWNERS
+++ b/tools/aapt2/OWNERS
@@ -1,3 +1,4 @@
 set noparent
 toddke@google.com
-rtmitchell@google.com
+rtmitchell@google.com
 patb@google.com
`@@ -1 +1 @@`
	`per-file SystemConfig.java = toddke@google.com`	`per-file SystemConfig.java = toddke@google.com,patb@google.com`