diff options
| author | 2017-02-21 16:41:43 -0800 | |
|---|---|---|
| committer | 2017-02-21 16:41:43 -0800 | |
| commit | 5555bccc70c032206ba1efe6961e3d021239d51b (patch) | |
| tree | 1cf7db642eb888c046bfa074532e19a317898d0d | |
| parent | c61cd1a6354bce0a34f3a44989b4412bef71b7bd (diff) | |
Replace WearWifi/Cell services with WearConnectivityService
go/wear-connectivity-service
Change-Id: I2a8214e2965ad63a23dc8c174db256a263102a6f
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 05071ad2eee7..19c1abd9a414 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -160,10 +160,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 = @@ -1187,10 +1185,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 (SystemProperties.getBoolean("config.enable_cellmediator", false)) { - mSystemServiceManager.startService(WEAR_CELLULAR_MEDIATOR_SERVICE_CLASS); - } + mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS); if (!disableNonCoreServices) { mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS); } |