summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2012-10-25 12:23:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-25 12:23:20 -0700
commitb3975088b6f10d45ed5589f10887a4bc12fe942c (patch)
tree8e4a95231e72bccd94309b00d73d5aee68bfbe8f /packages
parentd85a960b14203f63c7e2b8b16235b60ea1023151 (diff)
parent9023cf91018c75a179d04256fd4e306065528117 (diff)
downloadframeworks_base-b3975088b6f10d45ed5589f10887a4bc12fe942c.zip
frameworks_base-b3975088b6f10d45ed5589f10887a4bc12fe942c.tar.gz
frameworks_base-b3975088b6f10d45ed5589f10887a4bc12fe942c.tar.bz2
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
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/ImageWallpaper.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 0a7dd7c..9da883a 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;