Merge "Eliminating dead logic - bitmap state simply cannot be null here."

2011-04-28 14:57:14 -07:00
parent 11d7ec24a5 e42143aa57
commit 501f7bca83
1 changed files with 1 additions and 3 deletions
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -474,10 +474,8 @@ public class BitmapDrawable extends Drawable {
        mBitmapState = state;
        if (res != null) {
            mTargetDensity = res.getDisplayMetrics().densityDpi;
-        } else if (state != null) {
-            mTargetDensity = state.mTargetDensity;
        } else {
-            mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;
+            mTargetDensity = state.mTargetDensity;
        }
        setBitmap(state.mBitmap);
    }