From 959ee4a7b14a72045219d864508449bde04f82a6 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Sat, 9 Dec 2017 12:57:41 +0900 Subject: [PATCH] Extend connectivity OWNERS Also remove 'build.master@android.com' which is deprecated, not declared by anybody else, and makes the linter unhappy. Bug: 70394432 Test: built Merged-In: I9c0ba41386129379f82259fcc5e745562b014fae (cherry pick from commit 626eed2ac826a34b3ac9b1d4ddb9a783222187ec) Change-Id: Ie802113d61f693d73f7234b44ac2a9bd462b3fbf --- core/java/android/net/OWNERS | 1 + core/java/com/android/internal/net/OWNERS | 2 ++ core/java/com/android/server/net/OWNERS | 2 ++ packages/CaptivePortalLogin/OWNERS | 7 ++----- services/core/java/com/android/server/OWNERS | 6 ++++++ services/core/java/com/android/server/connectivity/OWNERS | 2 ++ services/core/java/com/android/server/net/OWNERS | 1 + services/net/OWNERS | 7 ++----- tests/net/OWNERS | 7 ++----- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index d1ce60e9ff087..6758d95fa6b68 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -1,6 +1,7 @@ ek@google.com hugobenichi@google.com jsharkey@android.com +jchalard@google.com lorenzo@google.com satk@google.com silberst@google.com diff --git a/core/java/com/android/internal/net/OWNERS b/core/java/com/android/internal/net/OWNERS index e2064a8099ae0..10d44bdecb83c 100644 --- a/core/java/com/android/internal/net/OWNERS +++ b/core/java/com/android/internal/net/OWNERS @@ -2,5 +2,7 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com jsharkey@android.com lorenzo@google.com +satk@google.com diff --git a/core/java/com/android/server/net/OWNERS b/core/java/com/android/server/net/OWNERS index 74f39a18ec2bb..6f77e04da3c05 100644 --- a/core/java/com/android/server/net/OWNERS +++ b/core/java/com/android/server/net/OWNERS @@ -2,4 +2,6 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/packages/CaptivePortalLogin/OWNERS b/packages/CaptivePortalLogin/OWNERS index 2d71c20130930..6f77e04da3c05 100644 --- a/packages/CaptivePortalLogin/OWNERS +++ b/packages/CaptivePortalLogin/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index e5fbdd21438c4..28481e2b176ba 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -1,9 +1,15 @@ per-file ConnectivityService.java=ek@google.com per-file ConnectivityService.java=hugobenichi@google.com +per-file ConnectivityService.java=jchalard@google.com per-file ConnectivityService.java=lorenzo@google.com +per-file ConnectivityService.java=satk@google.com per-file NetworkManagementService.java=ek@google.com per-file NetworkManagementService.java=hugobenichi@google.com +per-file NetworkManagementService.java=jchalard@google.com per-file NetworkManagementService.java=lorenzo@google.com +per-file NetworkManagementService.java=satk@google.com per-file NsdService.java=ek@google.com per-file NsdService.java=hugobenichi@google.com +per-file NsdService.java=jchalard@google.com per-file NsdService.java=lorenzo@google.com +per-file NsdService.java=satk@google.com diff --git a/services/core/java/com/android/server/connectivity/OWNERS b/services/core/java/com/android/server/connectivity/OWNERS index 74f39a18ec2bb..6f77e04da3c05 100644 --- a/services/core/java/com/android/server/connectivity/OWNERS +++ b/services/core/java/com/android/server/connectivity/OWNERS @@ -2,4 +2,6 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS index 6b77d8326a399..5d4287b9a812b 100644 --- a/services/core/java/com/android/server/net/OWNERS +++ b/services/core/java/com/android/server/net/OWNERS @@ -2,6 +2,7 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com jsharkey@android.com lorenzo@google.com satk@google.com diff --git a/services/net/OWNERS b/services/net/OWNERS index 2d71c20130930..6f77e04da3c05 100644 --- a/services/net/OWNERS +++ b/services/net/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/tests/net/OWNERS b/tests/net/OWNERS index 2d71c20130930..6f77e04da3c05 100644 --- a/tests/net/OWNERS +++ b/tests/net/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com