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

Add WearDisplayService to the system server;

Browse Source 
add a SET_DISPLAY_OFFSET permission.

Merged-In: I253766553a507e2ada7d631501d8d32d863a823f

Bug: 36515029
Test: No build failure; SystemServer loads as usual.
Change-Id: I253766553a507e2ada7d631501d8d32d863a823f
(cherry picked from commit 069f46ca34)
This commit is contained in:
Julius D'souza
2017-03-22 13:27:00 -07:00
parent 4d09adcef1
commit b9a71dfd38
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

@@ -1894,6 +1894,10 @@
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" />
<!-- ================================== --> <!-- ================================== -->
<!-- Permissions affecting the system wallpaper --> <!-- Permissions affecting the system wallpaper -->

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

@@ -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 =
@@ -1516,6 +1518,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();
} }