drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julius D'souza
2017-04-12 01:41:38 +00:00
committed by Android (Google) Code Review
parent 92e6a1d941 1185d842f7
commit 9e3c9eeb96
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/res/AndroidManifest.xml
View File

@ -1738,6 +1738,11 @@
android:description="@string/permdesc_systemAlertWindow" android:description="@string/permdesc_systemAlertWindow"
android:protectionLevel="signature|preinstalled|appop|pre23|development" /> 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 --> <!-- Permissions affecting the system wallpaper -->
<!-- ================================== --> <!-- ================================== -->

3
services/java/com/android/server/SystemServer.java
View File

@ -160,6 +160,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 =
@ -1184,6 +1186,7 @@ public final class SystemServer {
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS); mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
if (!disableNonCoreServices) { if (!disableNonCoreServices) {
mSystemServiceManager.startService(WEAR_DISPLAY_SERVICE_CLASS);
mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS); mSystemServiceManager.startService(WEAR_TIME_SERVICE_CLASS);
} }
} }