From b9a71dfd38e314f463461ed729da90c84ec809f0 Mon Sep 17 00:00:00 2001
From: Julius D'souza <jdsouza@google.com>
Date: Wed, 22 Mar 2017 13:27:00 -0700
Subject: [PATCH] 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)
---
 core/res/AndroidManifest.xml                       | 4 ++++
 services/java/com/android/server/SystemServer.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 90735e7b9e589..1eeb1860a0fb1 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1894,6 +1894,10 @@
                 android:description="@string/permdesc_useDataInBackground"
                 android:protectionLevel="signature" />
 
+    <!-- @hide Allows an application to set display offsets for the screen.
+         This permission is not available to third party applications. -->
+    <permission android:name="android.permission.SET_DISPLAY_OFFSET"
+        android:protectionLevel="signature|privileged" />
 
     <!-- ================================== -->
     <!-- Permissions affecting the system wallpaper -->
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 978803dfb5e0a..95ce5f8036bfc 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();
             }