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

Commit 2885331c authored by Nancy Zheng's avatar Nancy Zheng Committed by android-build-merger
Browse files

Merge \"Add WearWifiMediatorService to SystemServer.\" into nyc-mr1-dev 

am: 0171a6ef

Change-Id: I9e9aadd93ad8691bcde1d1728f10c9eb0a4c348d
parents d4255a9c 0171a6ef

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

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,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_TIME_SERVICE_CLASS =

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

    private static final String ACCOUNT_SERVICE_CLASS =
@@ -1163,6 +1165,7 @@ public final class SystemServer { 


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

            mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);

            mSystemServiceManager.startService(WEAR_WIFI_MEDIATOR_SERVICE_CLASS);

          if (!disableNonCoreServices) {

              mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

          }