From d6c0b844a0eb128a9429aa01d23d15ce095ef479 Mon Sep 17 00:00:00 2001
From: Mike Cleron <mcleron@google.com>
Date: Fri, 13 Nov 2009 16:37:27 -0800
Subject: [PATCH] Unbreak setting photos as wallpaper

---
 .../java/com/android/server/WallpaperManagerService.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 5b8e11cd30ae4..a24555a2294dd 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