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

am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."

Browse Source 
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
  Eliminating dead logic - bitmap state simply cannot be null here.
This commit is contained in:
Conley Owens
2011-04-29 14:57:18 -07:00
committed by Android Git Automerger
parent 889bb20f1b f26ec38c34
commit 7dcdfd7988
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -486,10 +486,8 @@ public class BitmapDrawable extends Drawable {
mBitmapState = state; mBitmapState = state;
if (res != null) { if (res != null) {
mTargetDensity = res.getDisplayMetrics().densityDpi; mTargetDensity = res.getDisplayMetrics().densityDpi;
} else if (state != null) {
mTargetDensity = state.mTargetDensity;
} else { } else {
mTargetDensity = DisplayMetrics.DENSITY_DEFAULT; mTargetDensity = state.mTargetDensity;
} }
setBitmap(state.mBitmap); setBitmap(state.mBitmap);
} }