summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-10-31 12:50:12 -0400
committerMike Lockwood <lockwood@google.com>2012-02-10 12:52:46 -0800
commitc067c9c373e673b2474e8dc2e5a00db274d5e13d (patch)
treeb147464dffbfeb42044edb1ac7f1c6735708ae90 /services
parent491f40ddf2a87d62f825cbf5b2088e86713b2032 (diff)
downloadframeworks_base-c067c9c373e673b2474e8dc2e5a00db274d5e13d.zip
frameworks_base-c067c9c373e673b2474e8dc2e5a00db274d5e13d.tar.gz
frameworks_base-c067c9c373e673b2474e8dc2e5a00db274d5e13d.tar.bz2
Add support for disabling wallpaper service
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/SystemServer.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index e92cd31..0dbc7c3 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -463,14 +463,17 @@ class ServerThread extends Thread {
reportWtf("starting DropBoxManagerService", e);
}
- try {
- Slog.i(TAG, "Wallpaper Service");
- if (!headless) {
- wallpaper = new WallpaperManagerService(context);
- ServiceManager.addService(Context.WALLPAPER_SERVICE, wallpaper);
+ if (context.getResources().getBoolean(
+ com.android.internal.R.bool.config_enableWallpaperService)) {
+ try {
+ Slog.i(TAG, "Wallpaper Service");
+ if (!headless) {
+ wallpaper = new WallpaperManagerService(context);
+ ServiceManager.addService(Context.WALLPAPER_SERVICE, wallpaper);
+ }
+ } catch (Throwable e) {
+ reportWtf("starting Wallpaper Service", e);
}
- } catch (Throwable e) {
- reportWtf("starting Wallpaper Service", e);
}
if (!"0".equals(SystemProperties.get("system_init.startaudioservice"))) {