diff options
| author | Conley Owens <cco3@android.com> | 2011-04-28 23:52:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-28 23:52:41 -0700 |
| commit | f26ec38c344af8cf91575b461028a3033b940d49 (patch) | |
| tree | dfb53ced18c6a83e04c394104e9ee4d65569e120 | |
| parent | eef8f148881f39feb0b1aded121bbfc63e8d30c2 (diff) | |
| parent | 501f7bca83ecc2200a590966e461590d9716df7d (diff) | |
| download | frameworks_base-f26ec38c344af8cf91575b461028a3033b940d49.zip frameworks_base-f26ec38c344af8cf91575b461028a3033b940d49.tar.gz frameworks_base-f26ec38c344af8cf91575b461028a3033b940d49.tar.bz2 | |
am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
Eliminating dead logic - bitmap state simply cannot be null here.
| -rw-r--r-- | graphics/java/android/graphics/drawable/BitmapDrawable.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java index 0b8465e..501374b 100644 --- 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); } |