summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2012-10-18 11:18:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-18 11:18:14 -0700
commit18937b22099723447388547a2d67f25bde6bdb10 (patch)
treecbc906b501175a46b37644490fc2c94f99c13c62 /packages/SystemUI/src/com/android
parent588fb15d16118b848c2d76497861b0e86846486b (diff)
parent8481ac8fe99e080a83e6bd5e4f1e656d3b950083 (diff)
downloadframeworks_base-18937b22099723447388547a2d67f25bde6bdb10.zip
frameworks_base-18937b22099723447388547a2d67f25bde6bdb10.tar.gz
frameworks_base-18937b22099723447388547a2d67f25bde6bdb10.tar.bz2
Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android')
-rw-r--r--packages/SystemUI/src/com/android/systemui/ImageWallpaper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
index 0958f70..4716668 100644
--- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
+++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -327,7 +327,7 @@ public class ImageWallpaper extends WallpaperService {
mLastRotation = newRotation;
// Load bitmap if it is not yet loaded or if it was loaded at a different size
- if (mBackground == null || dw != mBackgroundWidth || dw != mBackgroundHeight) {
+ if (mBackground == null || dw != mBackgroundWidth || dh != mBackgroundHeight) {
if (DEBUG) {
Log.d(TAG, "Reloading bitmap");
}