summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2019-08-05 16:00:12 -0700
committerFelipe Leme <felipeal@google.com>2019-11-19 01:24:52 +0000
commit8d4c825ce33ee448117a6353f416d935813bc7fc (patch)
treecf7c8d18477f4c523b6a95282e54d2194fc12335 /services/java/com/android/server/SystemServer.java
parent0537bd334d95af6b742aa64a3c6aefc96b27afa2 (diff)
Fixes usage of WallpaperManager to make it optional.
As the main javadoc states: "An app can check whether wallpapers are supported for the current user, by calling {@link #isWallpaperSupported()}, and whether setting of wallpapers is allowed, by calling {@link #isSetWallpaperAllowed()}." Test: manual verification on automotive Test: atest CtsAppTestCases:android.app.cts.WallpaperManagerTest # on automotive Bug: 138939803 Bug: 132111956 Change-Id: I88946f92ff54e556d289c41c28e22da3a4b8c8b8 Merged-In: I88946f92ff54e556d289c41c28e22da3a4b8c8b8 (cherry picked from commit 34a861add16eed6ef2f487b3d40017d5ad70c2a6)
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 97e003c78cd9..ae86b60a8ebf 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1474,6 +1474,8 @@ public final class SystemServer {
traceBeginAndSlog("StartWallpaperManagerService");
mSystemServiceManager.startService(WALLPAPER_SERVICE_CLASS);
traceEnd();
+ } else {
+ Slog.i(TAG, "Wallpaper service disabled by config");
}
traceBeginAndSlog("StartAudioService");