Merge "Start the Wear bluetooth service in SystemServer." into nyc-dev (20490290) · Commits · e / os / android_frameworks_base

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();