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

Commit b9a71dfd authored by Julius D'souza's avatar Julius D'souza
Browse files

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 069f46ca)
parent 4d09adce

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -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 -->

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

+3 −0
Original line number Diff line number Diff line
@@ -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();

            }