Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev

Romain Guy · Android (Google) Code Review · commit 86ad866283dc · 2012-10-11T15:50:17.000-07:00
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
@@ -967,7 +967,7 @@ public int getScaledHeight(int targetDensity) {
      * @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;
         }
         

Original file line number	Diff line number	Diff line change
`@@ -967,7 +967,7 @@ public int getScaledHeight(int targetDensity) {`
`967`	`967`	`* @hide`
`968`	`968`	`*/`
`969`	`969`	`static public int scaleFromDensity(int size, int sdensity, int tdensity) {`
`970`		`- if (sdensity == DENSITY_NONE \|\| sdensity == tdensity) {`
	`970`	`+ if (sdensity == DENSITY_NONE \|\| tdensity == DENSITY_NONE \|\| sdensity == tdensity) {`
`971`	`971`	`return size;`
`972`	`972`	`}`
`973`	`973`