Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei Liu
2016-03-31 16:47:50 +00:00
committed by Android (Google) Code Review
parent 8f647b5cdb 48d3b63b60
commit 2049029068
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/SystemServer.java
View File

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