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

Commit 4e4c99f9 authored by Julius D'souza's avatar Julius D'souza Committed by Android (Google) Code Review
Browse files

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

parents e67e60fa 069f46ca

core/res/AndroidManifest.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -1878,6 +1878,11 @@ 
        android:description="@string/permdesc_useDataInBackground"

        android:description="@string/permdesc_useDataInBackground"

        android:protectionLevel="signature" />

        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|development" />



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

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

    <!-- Permissions affecting the system wallpaper -->

    <!-- Permissions affecting the system wallpaper -->

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

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

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,8 @@ public final class SystemServer { 
            "com.google.android.clockwork.ThermalObserver";

            "com.google.android.clockwork.ThermalObserver";

    private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =

    private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =

            "com.google.android.clockwork.connectivity.WearConnectivityService";

            "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 =

    private static final String WEAR_TIME_SERVICE_CLASS =

            "com.google.android.clockwork.time.WearTimeService";

            "com.google.android.clockwork.time.WearTimeService";

    private static final String ACCOUNT_SERVICE_CLASS =

    private static final String ACCOUNT_SERVICE_CLASS =
@@ -1511,6 +1513,7 @@ public final class SystemServer { 




            if (!disableNonCoreServices) {

            if (!disableNonCoreServices) {

                traceBeginAndSlog("StartWearTimeService");

                traceBeginAndSlog("StartWearTimeService");

                mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS);

                mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

                mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);

                traceEnd();

                traceEnd();

            }

            }