summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wei Liu <luciferleo@google.com> 2017-01-14 03:51:58 +0000
committer android-build-merger <android-build-merger@google.com> 2017-01-14 03:51:58 +0000
commite0d2c77a506842df0525bab433bd1998d1336cef (patch)
tree5ff0cbc20b79a8ac99a8643310d1b38d03469c75
parent24b33094f6c05d7e218359928969489efb9b8fb5 (diff)
parentd741f3de8199f526125a461dffd49990fc648541 (diff)
Add WearCellularMediatorService to the system server.
am: d741f3de81 Change-Id: I6f3f0e2ea19f995f81816689c80b0bc865cc991e
-rw-r--r--services/java/com/android/server/SystemServer.java5
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 9e60f339fc03..b8fb147b4c95 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 =
@@ -1187,6 +1189,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);
}