diff options
| author | 2017-03-22 13:27:00 -0700 | |
|---|---|---|
| committer | 2017-05-01 13:14:56 -0700 | |
| commit | b9a71dfd38e314f463461ed729da90c84ec809f0 (patch) | |
| tree | 1093cb53251222a2320dc165c2aa8408553e61e6 /services/java/com | |
| parent | 4d09adcef11a4a26126d73ff9f452667303b1db7 (diff) | |
Add WearDisplayService to the system server;
add a SET_DISPLAY_OFFSET permission.
Merged-In: I253766553a507e2ada7d631501d8d32d863a823f
Bug: 36515029
Test: No build failure; SystemServer loads as usual.
Change-Id: I253766553a507e2ada7d631501d8d32d863a823f
(cherry picked from commit 069f46ca34162e531229aba04b0099ea1b9df6b1)
Diffstat (limited to 'services/java/com')
| -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 978803dfb5e0..95ce5f8036bf 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 = @@ -1516,6 +1518,7 @@ public final class SystemServer { if (!disableNonCoreServices) { traceBeginAndSlog("StartWearTimeService"); + mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS); mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS); traceEnd(); } |