diff options
| author | 2017-05-26 21:48:48 +0000 | |
|---|---|---|
| committer | 2017-05-26 21:49:00 +0000 | |
| commit | f4abac4d8f8ea9041b0106161bfda20f844aade6 (patch) | |
| tree | c9336ca3c5f8dca9aad32ad65c00ff9aa0648070 /services/java | |
| parent | 2c324042df1ace12831c9e25100be6309deb17b0 (diff) | |
| parent | b9a71dfd38e314f463461ed729da90c84ec809f0 (diff) | |
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
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 1d44a205ac10..6f53099a8627 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -185,6 +185,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 = @@ -1499,6 +1501,7 @@ public final class SystemServer { if (!disableNonCoreServices) { traceBeginAndSlog("StartWearTimeService"); + mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS); mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS); traceEnd(); } |