From c4130554205940ed80aff273dd7369b9e12818a3 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Mon, 10 Apr 2023 15:08:31 +0000 Subject: [PATCH] Fixing owners for backup includes A noparent was added to the backup OWNERS file that is included in the root source tree for SettingsProvider and a number of its tests. This proposed change breaks out the list of owners from the noparent so that backup owners can review SettingsProvider backup changes without preempting root owners of the package from approving their own code. Change-Id: I68d4332c65e2110aeeacb8d0ed23034351d675a5 Merged-In: I68d4332c65e2110aeeacb8d0ed23034351d675a5 --- .../src/android/provider/settings/OWNERS | 2 +- .../SettingsProvider/test/src/android/provider/OWNERS | 3 +-- services/backup/BACKUP_OWNERS | 10 ++++++++++ services/backup/OWNERS | 10 +--------- 4 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 services/backup/BACKUP_OWNERS diff --git a/packages/SettingsProvider/src/android/provider/settings/OWNERS b/packages/SettingsProvider/src/android/provider/settings/OWNERS index 0f888113d7309..d901e2cec3586 100644 --- a/packages/SettingsProvider/src/android/provider/settings/OWNERS +++ b/packages/SettingsProvider/src/android/provider/settings/OWNERS @@ -1,4 +1,4 @@ # Bug component: 656484 -include platform/frameworks/base:/services/backup/OWNERS +include platform/frameworks/base:/services/backup/BACKUP_OWNERS diff --git a/packages/SettingsProvider/test/src/android/provider/OWNERS b/packages/SettingsProvider/test/src/android/provider/OWNERS index 0f888113d7309..db4b27c8bc5ae 100644 --- a/packages/SettingsProvider/test/src/android/provider/OWNERS +++ b/packages/SettingsProvider/test/src/android/provider/OWNERS @@ -1,4 +1,3 @@ # Bug component: 656484 -include platform/frameworks/base:/services/backup/OWNERS - +include platform/frameworks/base:/services/backup/BACKUP_OWNERS diff --git a/services/backup/BACKUP_OWNERS b/services/backup/BACKUP_OWNERS new file mode 100644 index 0000000000000..f8f4f4f4bf2e3 --- /dev/null +++ b/services/backup/BACKUP_OWNERS @@ -0,0 +1,10 @@ +# Bug component: 1193469 + +jstemmer@google.com +martinoh@google.com +millmore@google.com +niamhfw@google.com +piee@google.com +philippov@google.com +rthakohov@google.com +sarpm@google.com \ No newline at end of file diff --git a/services/backup/OWNERS b/services/backup/OWNERS index 79709a3319c8c..3bd2db13eea1d 100644 --- a/services/backup/OWNERS +++ b/services/backup/OWNERS @@ -2,12 +2,4 @@ set noparent -bryanmawhinney@google.com -jstemmer@google.com -martinoh@google.com -millmore@google.com -niamhfw@google.com -piee@google.com -philippov@google.com -rthakohov@google.com -sarpm@google.com +include platform/frameworks/base:/services/backup/BACKUP_OWNERS