diff options
| author | Xiao Ma <xiaom@google.com> | 2021-12-28 09:16:09 +0000 |
|---|---|---|
| committer | Xiao Ma <xiaom@google.com> | 2022-03-14 13:47:01 +0000 |
| commit | f4d72b212cfbedaa73a659b29f4b0bcd9988a131 (patch) | |
| tree | fdecd320b11a028e744983fcfacf00e8f7a97d81 /services/java/com/android/server/SystemServer.java | |
| parent | b276239bbc8d2c0b896f714e8dfc0e022b44c658 (diff) | |
Split out the ethernet API surface and use framework-connectivity-t
Ethernet framework and service source code is going to be moved to
Connectivity mainline module, this CL contains below corresponding
changes to adapt the migration in f/b side:
1. Split out ethernet module-lib APIs to Connectivity module.
Add the ethernet resource filegroup to tiramisu-updatable-sources
filegroup as well, build them together. Also update the module-lib
and system api txt to reflect the APIs change. Remove the hidden
APIs which are moved to Connectivity module. This removal fixes the
api inconsistent issue with Tethering/apex/hidden/.
2. Remove EthernetService from SystemServer which will be registered
from ConnectivityServiceInitializer.
3. Replace the BackgroundThread class(imported from f/b/core/java)
with the one in the modules-utils-backgroundthread lib, which is
visible to Connectivity module.
Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Change-Id: I3e13cb9c0e348333af295c2537d459aa6700ff17
Merged-In: I1956848d3248cc56e9841d221e5e4c160bed65a4
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 5ae8a5abd6eb..67b656bf2bfc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -283,8 +283,6 @@ public final class SystemServer implements Dumpable { "com.android.server.wifi.p2p.WifiP2pService"; private static final String LOWPAN_SERVICE_CLASS = "com.android.server.lowpan.LowpanService"; - private static final String ETHERNET_SERVICE_CLASS = - "com.android.server.ethernet.EthernetService"; private static final String JOB_SCHEDULER_SERVICE_CLASS = "com.android.server.job.JobSchedulerService"; private static final String LOCK_SETTINGS_SERVICE_CLASS = @@ -1889,13 +1887,6 @@ public final class SystemServer implements Dumpable { t.traceEnd(); } - if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) || - mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) { - t.traceBegin("StartEthernet"); - mSystemServiceManager.startService(ETHERNET_SERVICE_CLASS); - t.traceEnd(); - } - t.traceBegin("StartPacProxyService"); try { pacProxyService = new PacProxyService(context); |
