diff options
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 9e8811f419a2..7b2495b06807 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -319,8 +319,6 @@ public final class SystemServer implements Dumpable { * Implementation class names for services in the {@code SYSTEMSERVERCLASSPATH} * from {@code PRODUCT_SYSTEM_SERVER_JARS} that are *not* in {@code services.jar}. */ - private static final String ARC_NETWORK_SERVICE_CLASS = - "com.android.server.arc.net.ArcNetworkService"; private static final String ARC_PERSISTENT_DATA_BLOCK_SERVICE_CLASS = "com.android.server.arc.persistent_data_block.ArcPersistentDataBlockService"; private static final String ARC_SYSTEM_HEALTH_SERVICE = @@ -2060,24 +2058,13 @@ public final class SystemServer implements Dumpable { if (context.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI)) { // Wifi Service must be started first for wifi-related services. - if (!isArc) { - t.traceBegin("StartWifi"); - mSystemServiceManager.startServiceFromJar( - WIFI_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); - t.traceEnd(); - t.traceBegin("StartWifiScanning"); - mSystemServiceManager.startServiceFromJar( - WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); - t.traceEnd(); - } - } - - // ARC - ArcNetworkService registers the ARC network stack and replaces the - // stock WiFi service in both ARC++ container and ARCVM. Always starts the ARC network - // stack regardless of whether FEATURE_WIFI is enabled/disabled (b/254755875). - if (isArc) { - t.traceBegin("StartArcNetworking"); - mSystemServiceManager.startService(ARC_NETWORK_SERVICE_CLASS); + t.traceBegin("StartWifi"); + mSystemServiceManager.startServiceFromJar( + WIFI_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); + t.traceEnd(); + t.traceBegin("StartWifiScanning"); + mSystemServiceManager.startServiceFromJar( + WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH); t.traceEnd(); } |