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

Commit abfd5bcc authored by Calvin On's avatar Calvin On Committed by android-build-merger
Browse files

Replace WearWifi/Cell services with WearConnectivityService 

am: 5555bccc

Change-Id: I5d8c97b8d5c394aeae99b7ddbe0dfdd5706a4293
parents d54f3a48 5555bccc

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

+3 −8
Original line number Diff line number Diff line
@@ -160,10 +160,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 =
@@ -1191,10 +1189,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 (SystemProperties.getBoolean("config.enable_cellmediator", false)) {

                mSystemServiceManager.startService(WEAR_CELLULAR_MEDIATOR_SERVICE_CLASS);

            }

            mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);

          if (!disableNonCoreServices) {

              mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

          }