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

Commit 017aee5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 94a93087 to master"

parents 1f08e136 9a74e5da

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

+0 −6
Original line number Diff line number Diff line
@@ -183,8 +183,6 @@ public final class SystemServer { 
            "com.android.server.search.SearchManagerService$Lifecycle";

    private static final String THERMAL_OBSERVER_CLASS =

            "com.google.android.clockwork.ThermalObserver";

    private static final String WEAR_BLUETOOTH_SERVICE_CLASS =

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

    private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =

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

    private static final String WEAR_TIME_SERVICE_CLASS =
@@ -1479,10 +1477,6 @@ public final class SystemServer { 
        }



        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {

            traceBeginAndSlog("StartWearBluetooth");

            mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);

            traceEnd();



            traceBeginAndSlog("StartWearConnectivityService");

            mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);

            traceEnd();