am 18937b2: Merge "Stop reloading wallpaper bitmap" into jb-mr1-dev

chethaase · Android Git Automerger · commit d170e1890bf5 · 2012-10-18T11:20:47.000-07:00
* commit '18937b22099723447388547a2d67f25bde6bdb10':
  Stop reloading wallpaper bitmap
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
@@ -327,7 +327,7 @@ void drawFrameLocked() {
             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");
                 }

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ void drawFrameLocked() {`
`327`	`327`	`mLastRotation = newRotation;`
`328`	`328`
`329`	`329`	`// Load bitmap if it is not yet loaded or if it was loaded at a different size`
`330`		`- if (mBackground == null \|\| dw != mBackgroundWidth \|\| dw != mBackgroundHeight) {`
	`330`	`+ if (mBackground == null \|\| dw != mBackgroundWidth \|\| dh != mBackgroundHeight) {`
`331`	`331`	`if (DEBUG) {`
`332`	`332`	`Log.d(TAG, "Reloading bitmap");`
`333`	`333`	`}`