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

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

Browse Source 
* commit '86ad866283dc05c2adb8f673510e8b45b0b5ee5f':
  Don't scale bitmaps to an empty size when targetDpi=0 Bug #7334217
This commit is contained in:
Romain Guy
2012-10-11 15:52:58 -07:00
committed by Android Git Automerger
parent 207b5e1722 86ad866283
commit fa6e9cf65a
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;
}