am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev

* commit '9023cf91018c75a179d04256fd4e306065528117':
  Set wallpaper bitmap reference to null before reloading

2 files changed, 1 insertions, 0 deletions

diff --git a/core/res/res/drawable-xhdpi/default_wallpaper.jpg b/core/res/res/drawable-xhdpi/default_wallpaper.jpg
index 5b8d1d59833e..da9fa91fae70 100644
--- a/core/res/res/drawable-xhdpi/default_wallpaper.jpg
+++ b/core/res/res/drawable-xhdpi/default_wallpaper.jpg
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 0a7dd7c76bf0..9da883a7f4c7 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -401,6 +401,7 @@ public class ImageWallpaper extends WallpaperService {
             Throwable exception = null;
             try {
                 mWallpaperManager.forgetLoadedWallpaper(); // force reload
+                mBackground = null;
                 mBackground = mWallpaperManager.getBitmap();
             } catch (RuntimeException e) {
                 exception = e;