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

Commit b82f3b09 authored by Zach Johnson's avatar Zach Johnson
Browse files

resolve merge conflicts of 989b2670 to master 

Change-Id: I0c967e85eb73664e236c0b7286ed14facdb327fa
parents 0bf67a29 989b2670

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

+9 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ public final class SystemServer { 
            "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_TIME_SERVICE_CLASS =

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

    private static final String ACCOUNT_SERVICE_CLASS =
@@ -1381,6 +1383,13 @@ public final class SystemServer { 
            traceBeginAndSlog("StartWearWifiMediator");

            mSystemServiceManager.startService(WEAR_WIFI_MEDIATOR_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);