diff options
| author | 2017-04-12 01:55:57 +0000 | |
|---|---|---|
| committer | 2017-04-12 01:55:57 +0000 | |
| commit | 3c6d6f53f3d1dc80740c1df94b9a1566f84f8f14 (patch) | |
| tree | 41d051f6137f73717799ffe0b2f750bd51a0f6bc | |
| parent | fbc531077f5e685d21b9ac48bc38c495273b9ea1 (diff) | |
| parent | 9e3c9eeb96fde8a3ae16ee0912e911dbc15ab5e4 (diff) | |
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am: 9e3c9eeb96
Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b0630c421ca9..8bd4e78558fa 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1740,6 +1740,11 @@ android:description="@string/permdesc_systemAlertWindow" android:protectionLevel="signature|preinstalled|appop|pre23|development" /> + <!-- @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|development" /> + <!-- ================================== --> <!-- Permissions affecting the system wallpaper --> <!-- ================================== --> diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index c3deb95dcd3e..2b9ce2c622c5 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -160,6 +160,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 = @@ -1188,6 +1190,7 @@ public final class SystemServer { 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); } } |