Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fa6e9cf65adf7d27714275510967a0eda0695cd4':
  Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217
This commit is contained in:
Romain Guy
2012-10-11 17:13:45 -07:00
committed by Android Git Automerger
parent 73030434e5 fa6e9cf65a
commit 6aa40ac595
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/java/android/graphics/Bitmap.java
View File

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