diff options
| author | 2017-03-21 22:52:48 +0000 | |
|---|---|---|
| committer | 2017-03-21 22:52:53 +0000 | |
| commit | 017aee5a6628a5c991c1ddba33f855c7458f206e (patch) | |
| tree | cb209a5cbacb2712f69fc648abfece4afcae6158 | |
| parent | 1f08e1369b72f9855b55c257b32bad7864dcfc2a (diff) | |
| parent | 9a74e5daf074e77c4085322a8eadef4101b790e1 (diff) | |
Merge "resolve merge conflicts of 94a93087c68c to master"
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 27274653f760..0ed56abe6fb1 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -183,8 +183,6 @@ 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 WEAR_CONNECTIVITY_SERVICE_CLASS = "com.google.android.clockwork.connectivity.WearConnectivityService"; private static final String WEAR_TIME_SERVICE_CLASS = @@ -1479,10 +1477,6 @@ public final class SystemServer { } if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - traceBeginAndSlog("StartWearBluetooth"); - mSystemServiceManager.startService(WEAR_BLUETOOTH_SERVICE_CLASS); - traceEnd(); - traceBeginAndSlog("StartWearConnectivityService"); mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS); traceEnd(); |