From d741f3de8199f526125a461dffd49990fc648541 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 13 Dec 2016 15:44:55 -0800 Subject: [PATCH] Add WearCellularMediatorService to the system server. Bug: 33589216 Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2 --- services/java/com/android/server/SystemServer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 0de6b77908564..05071ad2eee74 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); }