Commit fa6e9cf6 authored Oct 11, 2012 by Romain Guy Committed by Android Git Automerger Oct 11, 2012

am 86ad8662: Merge "Don\'t scale bitmaps to an empty size when targetDpi=0 Bug...

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

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

parents 207b5e17 86ad8662

graphics/java/android/graphics/Bitmap.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}