Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1185d842 authored by Julius D'souza's avatar Julius D'souza
Browse files

DO NOT MERGE: Add WearDisplayService to the system server; 

add a SET_DISPLAY_OFFSET permission.

Bug: 36515029
Change-Id: I253766553a507e2ada7d631501d8d32d863a823f
parent d1a0d197

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1738,6 +1738,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 -->

    <!-- ================================== -->

services/java/com/android/server/SystemServer.java

+3 −0
Original line number Diff line number Diff line
@@ -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 =
@@ -1184,6 +1186,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);

          }

        }