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

Commit f4abac4d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET... 

Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
parents 2c324042 b9a71dfd

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,10 @@ 
                android:description="@string/permdesc_useDataInBackground"

                android:protectionLevel="normal" />



    <!-- @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
@@ -185,6 +185,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 =
@@ -1499,6 +1501,7 @@ public final class SystemServer { 


            if (!disableNonCoreServices) {

                traceBeginAndSlog("StartWearTimeService");

                mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS);

                mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

                traceEnd();

            }