commit d741f3de8199f526125a461dffd49990fc648541
author Wei Liu <luciferleo@google.com> Tue Dec 13 15:44:55 2016 -0800
committer Zach Johnson <zachoverflow@google.com> Fri Jan 13 17:51:07 2017 -0800
tree 17a97a29d57eae0ff3bebb2f38bf0d86e8545ffe
parent 331a4bb8d464aebddad5ec04a27526ef1384cbd5

Add WearCellularMediatorService to the system server.

Bug: 33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0de6b77..05071ad 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -162,6 +162,8 @@
             "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 @@
         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);
           }