Cleanup OWNERS

Remove fine granularity ownership files (hard to maintain). Update
main to include full team(s).

Bug: 110536740
Test: N/A
Change-Id: I88b63f5c3e17cc74a29266eece762a1e4b4f4161

6 files changed, 1 insertions, 146 deletions

diff --git a/OWNERS b/OWNERS
index 1ad583126..d6e2130fb 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,11 +1,4 @@
 etancohen@google.com
-kuh@google.com
-mett@google.com
 mplass@google.com
-nywang@google.com
-quiche@google.com
 rpius@google.com
-satk@google.com
-silberst@google.com
-sohanirao@google.com
-zqiu@google.com
+satk@google.com
\ No newline at end of file
diff --git a/service/java/com/android/server/wifi/OWNERS b/service/java/com/android/server/wifi/OWNERS
deleted file mode 100644
index cfc5b77ec..000000000
--- a/service/java/com/android/server/wifi/OWNERS
+++ /dev/null
@@ -1,122 +0,0 @@
-# This file follows the Gerrit find-owners OWNERS syntax described at
-# https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/syntax.md
-
-etancohen@google.com
-kuh@google.com
-lorenzo@google.com
-mett@google.com
-mplass@google.com
-nywang@google.com
-quiche@google.com
-rpius@google.com
-silberst@google.com
-sohanirao@google.com
-zqiu@google.com
-
-# configuration
-per-file WifiBackupRestore*=rpius@google.com
-per-file WifiBackupRestore*=satk@google.com
-per-file WifiConfigManager*=rpius@google.com
-per-file WifiConfigManager*=satk@google.com
-per-file WifiConfigStore*=rpius@google.com
-per-file WifiConfigStore*=satk@google.com
-per-file WifiSupplicantControl*=rpius@google.com
-per-file WifiSupplicantControl*=satk@google.com
-
-# diagnostics
-per-file BaseWifiDiagnostics*=quiche@google.com
-per-file BaseWifiDiagnostics*=satk@google.com
-per-file LastMileLogger*=quiche@google.com
-per-file LastMileLogger*=satk@google.com
-per-file WifiDiagnostics*=quiche@google.com
-per-file WifiDiagnostics*=satk@google.com
-per-file WifiLoggerHal*=quiche@google.com
-per-file WifiLoggerHal*=satk@google.com
-
-# HAL support
-per-file HalDeviceManager*=etancohen@google.com
-per-file HalDeviceManager*=satk@google.com
-per-file SupplicantStaNetworkHal*=kuh@google.com
-per-file SupplicantStaNetworkHal*=rpius@google.com
-per-file SupplicantStaNetworkHal*=satk@google.com
-per-file SupplicantStaIfaceHal*=kuh@google.com
-per-file SupplicantStaIfaceHal*=rpius@google.com
-per-file SupplicantStaIfaceHal*=satk@google.com
-per-file WifiVendorHal*=mplass@google.com
-per-file WifiVendorHal*=satk@google.com
-
-# logging
-per-file DummyLogMessage*=quiche@google.com
-per-file DummyLogMessage*=satk@google.com
-per-file FakeWifiLog*=quiche@google.com
-per-file FakeWifiLog*=satk@google.com
-per-file LogcatLog*=quiche@google.com
-per-file LogcatLog*=satk@google.com
-per-file WifiLog*=quiche@google.com
-per-file WifiLog*=satk@google.com
-
-# mode management
-per-file ActiveModeManager*=silberst@google.com
-per-file ActiveModeManager*=satk@google.com
-per-file ClientModeManager*=silberst@google.com
-per-file ClientModeManager*=satk@google.com
-per-file ScanOnlyModeManager*=silberst@google.com
-per-file ScanOnlyModeManager*=satk@google.com
-per-file WifiController*=silberst@google.com
-per-file WifiController*=satk@google.com
-per-file WifiService*=silberst@google.com
-per-file WifiService*=satk@google.com
-per-file WifiServiceImpl*=silberst@google.com
-per-file WifiServiceImpl*=satk@google.com
-per-file ClientModeImpl*=silberst@google.com
-per-file ClientModeImpl*=satk@google.com
-
-# network selection
-per-file SavedNetworkEvaluator*=quiche@google.com
-per-file SavedNetworkEvaluator*=silberst@google.com
-per-file SavedNetworkEvaluator*=satk@google.com
-per-file WifiConnectivityManager*=quiche@google.com
-per-file WifiConnectivityManager*=silberst@google.com
-per-file WifiConnectivityManager*=satk@google.com
-per-file WifiNetworkSelector*=quiche@google.com
-per-file WifiNetworkSelector*=silberst@google.com
-per-file WifiNetworkSelector*=satk@google.com
-
-# random bits
-per-file ByteBufferReader*=zqiu@google.com
-per-file ByteBufferReader*=satk@google.com
-per-file IMSIParameter*=zqiu@google.com
-per-file IMSIParameter*=satk@google.com
-per-file SIMAccessor*=zqiu@google.com
-per-file SIMAccessor*=satk@google.com
-per-file WifiCountryCode*=nywang@google.com
-per-file WifiCountryCode*=satk@google.com
-per-file WifiLastResortWatchdog*=kuh@google.com
-per-file WifiLastResortWatchdog*=silberst@google.com
-per-file WifiLastResortWatchdog*=satk@google.com
-per-file WifiMetrics*=kuh@google.com
-per-file WifiMetrics*=satk@google.com
-per-file WifiScoreReport*=mplass@google.com
-per-file WifiScoreReport*=satk@google.com
-
-# soft-ap/tethering
-per-file SoftApManager*=silberst@google.com
-per-file SoftApManager*=satk@google.com
-per-file WifiApConfigStore*=silberst@google.com
-per-file WifiApConfigStore*=satk@google.com
-
-# test-support
-per-file Clock*=quiche@google.com
-per-file Clock*=satk@google.com
-per-file FrameworkFacade*=kuh@google.com
-per-file FrameworkFacade*=rpius@google.com
-per-file FrameworkFacade*=silberst@google.com
-per-file FrameworkFacade*=satk@google.com
-per-file WifiInjector*=kuh@google.com
-per-file WifiInjector*=rpius@google.com
-per-file WifiInjector*=silberst@google.com
-per-file WifiInjector*=satk@google.com
-
-# wificond
-per-file WificondControl*=nywang@google.com
-per-file WificondControl*=satk@google.com
diff --git a/service/java/com/android/server/wifi/aware/OWNERS b/service/java/com/android/server/wifi/aware/OWNERS
deleted file mode 100644
index cf116f89d..000000000
--- a/service/java/com/android/server/wifi/aware/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-etancohen@google.com
diff --git a/service/java/com/android/server/wifi/hotspot2/OWNERS b/service/java/com/android/server/wifi/hotspot2/OWNERS
deleted file mode 100644
index 08b6c9eca..000000000
--- a/service/java/com/android/server/wifi/hotspot2/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-sohanirao@google.com
-etancohen@google.com
diff --git a/service/java/com/android/server/wifi/util/OWNERS b/service/java/com/android/server/wifi/util/OWNERS
deleted file mode 100644
index 9e0a7ec87..000000000
--- a/service/java/com/android/server/wifi/util/OWNERS
+++ /dev/null
@@ -1,12 +0,0 @@
-# diagnostics
-per-file ByteArrayRingBuffer*=quiche@google.com
-per-file FrameParser*=quiche@google.com
-
-# random bits
-per-file StringUtil*=quiche@google.com
-per-file WifiPermissionsUtil*=sohanirao@google.com
-per-file WifiPermissionsWrapper*=sohanirao@google.com
-
-# tracing (app/framework interaction)
-per-file WifiAsyncChannel*=sohanirao@google.com
-per-file WifiHandler*=sohanirao@google.com
diff --git a/service/java/com/android/server/wifi/wificond/OWNERS b/service/java/com/android/server/wifi/wificond/OWNERS
deleted file mode 100644
index dab2f9585..000000000
--- a/service/java/com/android/server/wifi/wificond/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-nywang@google.com