am d54261aa: Merge change Id6c0b844 into eclair
Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-plus-aosp
* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
Unbreak setting photos as wallpaper
diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 5b8e11c..a24555a2 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -126,6 +126,11 @@
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 @@
// 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