commit 4094fb3c5b95c88d689238cbf0a9e2c169a5e557
author Romain Guy <romainguy@android.com> Mon Jul 16 01:55:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 16 01:55:55 2012 -0700
tree b645b4d648b116b3927fcda7352f6a9a5b312f8c
parent d304e8bfc7094763cdbbfc2d84f71e2912f7bfcf
parent 8d1704215e80ebec61f6d77c503d83b32d881096

am 8d170421: Merge "Fix wrong condition."

* commit '8d1704215e80ebec61f6d77c503d83b32d881096':
  Fix wrong condition.

policy/src/com/android/internal/policy/impl/IconUtilities.java

diff --git a/policy/src/com/android/internal/policy/impl/IconUtilities.java b/policy/src/com/android/internal/policy/impl/IconUtilities.java
index e997355..a47c904 100644
--- a/policy/src/com/android/internal/policy/impl/IconUtilities.java
+++ b/policy/src/com/android/internal/policy/impl/IconUtilities.java
@@ -130,7 +130,7 @@
         int sourceWidth = icon.getIntrinsicWidth();
         int sourceHeight = icon.getIntrinsicHeight();
 
-        if (sourceWidth > 0 && sourceWidth > 0) {
+        if (sourceWidth > 0 && sourceHeight > 0) {
             // There are intrinsic sizes.
             if (width < sourceWidth || height < sourceHeight) {
                 // It's too big, scale it down.