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

Commit 6717748e authored by Julius D'souza's avatar Julius D'souza Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a... 

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb
am: 3c6d6f53

Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
parents 540bc2d9 3c6d6f53

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -1792,6 +1792,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
@@ -159,6 +159,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 =
@@ -1209,6 +1211,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);

          }

        }