diff options
| author | 2017-01-14 03:46:06 +0000 | |
|---|---|---|
| committer | 2017-01-14 03:46:09 +0000 | |
| commit | 7a6c54128a87eeba73d362a9de2f1f64939bf3a9 (patch) | |
| tree | 7239a33be8fe84c71df2d9fe691a3f16c641dbe6 | |
| parent | b2db3761cdea4d80cbe373b0dc36421d1cc8db4c (diff) | |
| parent | d741f3de8199f526125a461dffd49990fc648541 (diff) | |
Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 0de6b7790856..05071ad2eee7 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -162,6 +162,8 @@ public final class SystemServer { "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_TIME_SERVICE_CLASS = "com.google.android.clockwork.time.WearTimeService"; private static final String ACCOUNT_SERVICE_CLASS = @@ -1186,6 +1188,9 @@ 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); + } if (!disableNonCoreServices) { mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS); } |