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

Merge "resolve merge conflicts of f17c1d4888 to master"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-23 03:43:55 +00:00
committed by Android (Google) Code Review
parent 26a449e62a a91e5368f0
commit a497770920
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,10 +182,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_CELLULAR_MEDIATOR_SERVICE_CLASS =
"com.google.android.clockwork.cellular.WearCellularMediatorService";
private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =
"com.google.android.clockwork.connectivity.WearConnectivityService";
private static final String WEAR_TIME_SERVICE_CLASS =
"com.google.android.clockwork.time.WearTimeService";
private static final String ACCOUNT_SERVICE_CLASS =
@@ -1459,16 +1457,10 @@ public final class SystemServer {
mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS);
traceEnd();
traceBeginAndSlog("StartWearWifiMediator");
mSystemServiceManager.startService(WEAR_WIFI_MEDIATOR_SERVICE_CLASS);
traceBeginAndSlog("StartWearConnectivityService");
mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
traceEnd();
if (SystemProperties.getBoolean("config.enable_cellmediator", false)) {
traceBeginAndSlog("StartWearCellularMediator");
mSystemServiceManager.startService(WEAR_CELLULAR_MEDIATOR_SERVICE_CLASS);
traceEnd();
}
if (!disableNonCoreServices) {
traceBeginAndSlog("StartWearTimeService");
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);