diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-11 15:50:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-11 15:50:17 -0700 |
| commit | 86ad866283dc05c2adb8f673510e8b45b0b5ee5f (patch) | |
| tree | 26a557b66cdf00ecc3785aa77ca8c9406d08f7c0 /graphics | |
| parent | 402099f7861f306c2dd7c561bdc19b8f65d79b65 (diff) | |
| parent | 0b68477f8287fe5ddac1beb1c9d0811ded034dad (diff) | |
| download | frameworks_base-86ad866283dc05c2adb8f673510e8b45b0b5ee5f.zip frameworks_base-86ad866283dc05c2adb8f673510e8b45b0b5ee5f.tar.gz frameworks_base-86ad866283dc05c2adb8f673510e8b45b0b5ee5f.tar.bz2 | |
Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 4604437..6238edb 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -967,7 +967,7 @@ public final class Bitmap implements Parcelable { * @hide */ static public int scaleFromDensity(int size, int sdensity, int tdensity) { - if (sdensity == DENSITY_NONE || sdensity == tdensity) { + if (sdensity == DENSITY_NONE || tdensity == DENSITY_NONE || sdensity == tdensity) { return size; } |