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

Commit 13041985 authored by Wei Liu's avatar Wei Liu Committed by android-build-merger
Browse files

Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev 

am: 20490290

* commit '20490290':
  Start the Wear bluetooth service in SystemServer.

Change-Id: I9b34e8cc3d8f05ee624b6de5dbcd4aebe0999ace
parents 3c9b4983 20490290

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

+7 −2
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ 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 PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
@@ -959,8 +961,7 @@ public final class SystemServer { 
            if (!disableNonCoreServices) {

                mSystemServiceManager.startService(DockObserver.class);



                if (context.getPackageManager().hasSystemFeature

                        (PackageManager.FEATURE_WATCH)) {

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

                    mSystemServiceManager.startService(THERMAL_OBSERVER_CLASS);

                }

            }
@@ -1172,6 +1173,10 @@ public final class SystemServer { 
            mSystemServiceManager.startService(MediaProjectionManagerService.class);

        }



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

            mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);

        }



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

        // we are in safe mode.

        final boolean safeMode = wm.detectSafeMode();