Merge "Add WearWifiMediatorService to SystemServer." into nyc-mr1-dev
This commit is contained in:
@@ -159,6 +159,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_TIME_SERVICE_CLASS =
|
||||
"com.google.android.clockwork.time.WearTimeService";
|
||||
private static final String ACCOUNT_SERVICE_CLASS =
|
||||
@@ -1163,6 +1165,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 (!disableNonCoreServices) {
|
||||
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user