summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Cleron <mcleron@google.com>2009-11-13 16:37:27 -0800
committerMike Cleron <mcleron@google.com>2009-11-13 16:37:27 -0800
commitd6c0b844a0eb128a9429aa01d23d15ce095ef479 (patch)
treeceafcab803c15dc90ae08c2a001bd12d99644c66 /services
parent322b6ee7e158b0b979d8156df8fd59f4a9b95ab9 (diff)
downloadframeworks_base-d6c0b844a0eb128a9429aa01d23d15ce095ef479.zip
frameworks_base-d6c0b844a0eb128a9429aa01d23d15ce095ef479.tar.gz
frameworks_base-d6c0b844a0eb128a9429aa01d23d15ce095ef479.tar.bz2
Unbreak setting photos as wallpaper
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WallpaperManagerService.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 5b8e11c..a24555a 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -126,6 +126,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
int mWidth = -1;
int mHeight = -1;
String mName = "";
+
+ /**
+ * The component name of the currently set live wallpaper. This will be null if the
+ * wallpaper uses the built in ImageWallpaper component to display a bitmap.
+ */
ComponentName mWallpaperComponent;
WallpaperConnection mWallpaperConnection;
long mLastDiedTime;
@@ -366,6 +371,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
// See if there is a default wallpaper component specified
// Only look for this if the wallpaper is not being set to a bitmap
realComponentName = ComponentName.unflattenFromString(defaultComponent);
+ componentName = realComponentName;
}
if (realComponentName == null) {
// Fall back to static image wallpaper