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

Commit 2c17b669 authored by Roshan Pius's avatar Roshan Pius
Browse files

Revert "Revert "SystemServer: Dynamically load wifi-service" 

Revert submission 10144846-revert-10103769-load_wifi_service_dynamically-XZNQJHXURR

Reason for revert: Changes in build system to store uncompressed and aligned DEX files for java libs in APEXes.

Reverted Changes:
Icc0b680c2: Revert "SystemServer: Dynamically load wifi-servic...
I83a2f93e3: Revert "product: Remove wifi-service off SystemSer...


Bug: 148099857
Bug: 162371380
Bug: 162746981
Test: Compiles
Change-Id: I6c3f36873cae476dc76fd353d20fb6bd2c177f0b
parent b8c40cde

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

+16 −7
Original line number Diff line number Diff line
@@ -232,8 +232,14 @@ public final class SystemServer { 
            "com.android.server.usb.UsbService$Lifecycle";

    private static final String MIDI_SERVICE_CLASS =

            "com.android.server.midi.MidiService$Lifecycle";

    private static final String WIFI_APEX_SERVICE_JAR_PATH =

            "/apex/com.android.wifi/javalib/service-wifi.jar";

    private static final String WIFI_SERVICE_CLASS =

            "com.android.server.wifi.WifiService";

    private static final String WIFI_SCANNING_SERVICE_CLASS =

            "com.android.server.wifi.scanner.WifiScanningService";

    private static final String WIFI_RTT_SERVICE_CLASS =

            "com.android.server.wifi.rtt.RttService";

    private static final String WIFI_AWARE_SERVICE_CLASS =

            "com.android.server.wifi.aware.WifiAwareService";

    private static final String WIFI_P2P_SERVICE_CLASS =
@@ -1483,33 +1489,36 @@ public final class SystemServer { 
                    PackageManager.FEATURE_WIFI)) {

                // Wifi Service must be started first for wifi-related services.

                t.traceBegin("StartWifi");

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                mSystemServiceManager.startServiceFromJar(

                        WIFI_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

                t.traceBegin("StartWifiScanning");

                mSystemServiceManager.startService(

                        "com.android.server.wifi.scanner.WifiScanningService");

                mSystemServiceManager.startServiceFromJar(

                        WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_RTT)) {

                t.traceBegin("StartRttService");

                mSystemServiceManager.startService(

                        "com.android.server.wifi.rtt.RttService");

                mSystemServiceManager.startServiceFromJar(

                        WIFI_RTT_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_AWARE)) {

                t.traceBegin("StartWifiAware");

                mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);

                mSystemServiceManager.startServiceFromJar(

                        WIFI_AWARE_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_DIRECT)) {

                t.traceBegin("StartWifiP2P");

                mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);

                mSystemServiceManager.startServiceFromJar(

                        WIFI_P2P_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

            }