Merge "Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217" into jb-mr1-dev (86ad8662) · Commits · e / os / android_frameworks_base

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