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

Commit a91e5368 authored by Calvin On's avatar Calvin On
Browse files

resolve merge conflicts of f17c1d48 to master 

OCL: http://ag/1932572

Test: refactoring CL, with unit tests

Change-Id: I5da27ee70afb8bf6e5fe9f6f3b545cd26d5c8d20
parents f764962b f17c1d48

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

+4 −12
Original line number Diff line number Diff line
@@ -182,10 +182,8 @@ public final class SystemServer { 
            "com.google.android.clockwork.ThermalObserver";

    private static final String WEAR_BLUETOOTH_SERVICE_CLASS =

            "com.google.android.clockwork.bluetooth.WearBluetoothService";

    private static final String WEAR_WIFI_MEDIATOR_SERVICE_CLASS =

            "com.google.android.clockwork.wifi.WearWifiMediatorService";

    private static final String WEAR_CELLULAR_MEDIATOR_SERVICE_CLASS =

            "com.google.android.clockwork.cellular.WearCellularMediatorService";

    private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =

            "com.google.android.clockwork.connectivity.WearConnectivityService";

    private static final String WEAR_TIME_SERVICE_CLASS =

            "com.google.android.clockwork.time.WearTimeService";

    private static final String ACCOUNT_SERVICE_CLASS =
@@ -1459,16 +1457,10 @@ public final class SystemServer { 
            mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);

            traceEnd();



            traceBeginAndSlog("StartWearWifiMediator");

            mSystemServiceManager.startService(WEAR_WIFI_MEDIATOR_SERVICE_CLASS);

            traceBeginAndSlog("StartWearConnectivityService");

            mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);

            traceEnd();



            if (SystemProperties.getBoolean("config.enable_cellmediator", false)) {

                traceBeginAndSlog("StartWearCellularMediator");

                mSystemServiceManager.startService(WEAR_CELLULAR_MEDIATOR_SERVICE_CLASS);

                traceEnd();

            }



            if (!disableNonCoreServices) {

                traceBeginAndSlog("StartWearTimeService");

                mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);