Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-26 21:48:48 +00:00
committed by Android (Google) Code Review
parent 2c324042df b9a71dfd38
commit f4abac4d8f
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/AndroidManifest.xml
View File

@@ -1901,6 +1901,10 @@
android:description="@string/permdesc_useDataInBackground" android:description="@string/permdesc_useDataInBackground"
android:protectionLevel="normal" /> 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 --> <!-- Permissions affecting the system wallpaper -->

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

@@ -185,6 +185,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 =
@@ -1499,6 +1501,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();
} }