commit 1185d842f7688cdb93e614c7d84e65a60e039ab7
author Julius D'souza <jdsouza@google.com> Wed Mar 22 13:27:00 2017 -0700
committer Julius D'souza <jdsouza@google.com> Wed Apr 05 17:16:39 2017 -0700
tree b53feb99ff6b4e8862f76f990efa7d9774617a9d
parent d1a0d197940185f52d0aeebad7b5524acb363cf0

DO NOT MERGE: Add WearDisplayService to the system server;
add a SET_DISPLAY_OFFSET permission.

Bug: 36515029
Change-Id: I253766553a507e2ada7d631501d8d32d863a823f

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 6dd3189..76b73d5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -160,6 +160,8 @@
             "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 =
@@ -1184,6 +1186,7 @@
         if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
             mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
           if (!disableNonCoreServices) {
+              mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS);
               mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
           }
         }