commit 5ce5cdb6ac4f5b0705f4ff8cf4fd0101578d40d1
author Romain Guy <romainguy@google.com> Thu Oct 11 17:53:35 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 11 17:53:35 2012 -0700
tree 43c5d503e323e10a70e91c244d03a39702906744
parent b9c78e89d60385b0b3d1691900791331688c0b22
parent 6aa40ac59516d4286b2013e33b9f37633ec0fe91

am 6aa40ac5: am fa6e9cf6: am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev

* commit '6aa40ac59516d4286b2013e33b9f37633ec0fe91':
  Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217

graphics/java/android/graphics/Bitmap.java

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 @@
      * @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;
         }