diff options
| author | 2023-08-17 02:21:03 +0000 | |
|---|---|---|
| committer | 2023-08-17 02:21:03 +0000 | |
| commit | 0c711dfe31af9ad8315b58a75c3e6f0261bfe4a8 (patch) | |
| tree | b1ead0fb0aad638a6ce577e8489547a1e8ae5b1a | |
| parent | eb7a3d47ce9e943ada31d42b111fa37f17b179a4 (diff) | |
| parent | 163599bd7c93a36a3211167397f7b6480a8c161d (diff) | |
Merge "Update owners for keystore related files" into main am: 488eed6f84 am: b7f303e86c am: 163599bd7c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704211
Change-Id: Id383c511c9a8b6de605271d603ec2ada25f61c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/security/OWNERS | 3 | ||||
| -rw-r--r-- | core/java/android/security/keystore/OWNERS | 6 | ||||
| -rw-r--r-- | core/java/android/security/keystore/recovery/OWNERS | 5 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/security/keystore/OWNERS | 1 | ||||
| -rw-r--r-- | keystore/OWNERS | 2 |
5 files changed, 4 insertions, 13 deletions
diff --git a/core/java/android/security/OWNERS b/core/java/android/security/OWNERS index 7140ff12be64..dd17788c7811 100644 --- a/core/java/android/security/OWNERS +++ b/core/java/android/security/OWNERS @@ -7,5 +7,4 @@ per-file NetworkSecurityPolicy.java = cbrubaker@google.com per-file NetworkSecurityPolicy.java = klyubin@google.com per-file FrameworkNetworkSecurityPolicy.java = cbrubaker@google.com per-file FrameworkNetworkSecurityPolicy.java = klyubin@google.com -per-file Confirmation*.java = jdanis@google.com -per-file Confirmation*.java = swillden@google.com +per-file Confirmation*.java = file:/keystore/OWNERS diff --git a/core/java/android/security/keystore/OWNERS b/core/java/android/security/keystore/OWNERS index 65129a46d113..d9e01161ce6d 100644 --- a/core/java/android/security/keystore/OWNERS +++ b/core/java/android/security/keystore/OWNERS @@ -1,5 +1 @@ -# Bug component: 189335 - -swillden@google.com -jdanis@google.com -jbires@google.com +include /keystore/OWNERS diff --git a/core/java/android/security/keystore/recovery/OWNERS b/core/java/android/security/keystore/recovery/OWNERS deleted file mode 100644 index 65129a46d113..000000000000 --- a/core/java/android/security/keystore/recovery/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -# Bug component: 189335 - -swillden@google.com -jdanis@google.com -jbires@google.com diff --git a/core/tests/coretests/src/android/security/keystore/OWNERS b/core/tests/coretests/src/android/security/keystore/OWNERS new file mode 100644 index 000000000000..d9e01161ce6d --- /dev/null +++ b/core/tests/coretests/src/android/security/keystore/OWNERS @@ -0,0 +1 @@ +include /keystore/OWNERS diff --git a/keystore/OWNERS b/keystore/OWNERS index 7ab9d761e236..913f65586cd6 100644 --- a/keystore/OWNERS +++ b/keystore/OWNERS @@ -1,4 +1,4 @@ +# Bug component: 189335 eranm@google.com jbires@google.com -jdanis@google.com swillden@google.com |