diff options
| author | 2021-12-08 07:41:18 +0000 | |
|---|---|---|
| committer | 2021-12-08 07:41:18 +0000 | |
| commit | 868dc92b0168d0af83eaf65534df242212b973c6 (patch) | |
| tree | dd6d53a94711fe62e1d4d0e36247dbdc607a8898 | |
| parent | e371f9ace308824e5b7ab292d8daf7b9df09dace (diff) | |
| parent | ac7bb16ec5e2ef95e9c8afe0db6fd3ba1c7d8f22 (diff) | |
Merge "Add additional IPsec owners" am: c532fc2bde am: ac7bb16ec5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910230
Change-Id: I023a53d3f985a72753a46bbda7afbd0fdb62f68b
| -rw-r--r-- | core/java/android/net/OWNERS | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/OWNERS | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index f55bcd31feb7..b989488f9015 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -2,5 +2,6 @@ set noparent include platform/frameworks/base:/services/core/java/com/android/server/net/OWNERS +per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS per-file SSL*,Uri*,Url* = prb@google.com,oth@google.com,narayan@google.com,ngeoffray@google.com per-file SntpClient* = file:/services/core/java/com/android/server/timedetector/OWNERS diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index b6413773046f..71b463a4db8c 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -25,13 +25,14 @@ per-file *Battery* = file:/BATTERY_STATS_OWNERS per-file *Binder* = file:/core/java/com/android/internal/os/BINDER_OWNERS per-file *Bluetooth* = file:/core/java/android/bluetooth/OWNERS per-file *Gnss* = file:/services/core/java/com/android/server/location/OWNERS +per-file **IpSec* = file:/services/core/java/com/android/server/net/OWNERS +per-file **IpSec* = file:/services/core/java/com/android/server/vcn/OWNERS per-file *Location* = file:/services/core/java/com/android/server/location/OWNERS per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS per-file *Storage* = file:/core/java/android/os/storage/OWNERS per-file *TimeUpdate* = file:/core/java/android/app/timezone/OWNERS per-file DynamicSystemService.java = file:/packages/DynamicSystemInstallationService/OWNERS per-file GestureLauncherService.java = file:platform/packages/apps/EmergencyInfo:/OWNERS -per-file IpSecService.java = file:/services/core/java/com/android/server/net/OWNERS per-file MmsServiceBroker.java = file:/telephony/OWNERS per-file NetIdManager.java = file:/services/core/java/com/android/server/net/OWNERS per-file PackageWatchdog.java, RescueParty.java = file:/services/core/java/com/android/server/rollback/OWNERS |