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

Commit 03be7972 authored by Damien Bargiacchi's avatar Damien Bargiacchi Committed by android-build-merger
Browse files

Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev 

am: 96783005

* commit '96783005':
  Start the Wear Time System Service with SystemServer

Change-Id: Ief7dcfd771a4a97ac23ed0617301043f92738b95
parents 60bacac2 96783005

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

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

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

    private static final String ACCOUNT_SERVICE_CLASS =

            "com.android.server.accounts.AccountManagerService$Lifecycle";

    private static final String CONTENT_SERVICE_CLASS =
@@ -1158,6 +1160,9 @@ public final class SystemServer { 


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

            mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);

          if (!disableNonCoreServices) {

              mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

          }

        }



        // Before things start rolling, be sure we have decided whether