summaryrefslogtreecommitdiff
path: root/services/java/com
diff options
context:
space:
mode:
author Julius D'souza <jdsouza@google.com> 2017-04-12 03:29:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-04-12 03:29:25 +0000
commit4e4c99f9a56f8ff1282708e0ea38e41315429fac (patch)
treefae4c45c1109ea7bd4243dcd766e1d7939b16536 /services/java/com
parente67e60fad496fd0f0c4e11101679ea25f4020258 (diff)
parent069f46ca34162e531229aba04b0099ea1b9df6b1 (diff)
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission."
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/SystemServer.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e47da552c717..b1d2f208d930 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -186,6 +186,8 @@ public final class SystemServer {
"com.google.android.clockwork.ThermalObserver";
private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =
"com.google.android.clockwork.connectivity.WearConnectivityService";
+ private static final String WEAR_DISPLAY_SERVICE_CLASS =
+ "com.google.android.clockwork.display.WearDisplayService";
private static final String WEAR_TIME_SERVICE_CLASS =
"com.google.android.clockwork.time.WearTimeService";
private static final String ACCOUNT_SERVICE_CLASS =
@@ -1511,6 +1513,7 @@ public final class SystemServer {
if (!disableNonCoreServices) {
traceBeginAndSlog("StartWearTimeService");
+ mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS);
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
traceEnd();
}