Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11375490 authored by Hugo Benichi's avatar Hugo Benichi
Browse files

SystemServer: remove ArcNetworkService loading 

Bug: 354833944
Test: m; CQ
Flag: EXEMPT refactor, arc only
Change-Id: I4606f82cebb8b848b7ade812cccb51527c3d1b68
parent 86ee9a10

services/java/com/android/server/SystemServer.java

+7 −20
Original line number Diff line number Diff line
@@ -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,7 +2058,6 @@ 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);
@@ -2070,16 +2067,6 @@ public final class SystemServer implements Dumpable { 
                        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.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_RTT)) {