diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 15:11:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 15:11:45 -0700 |
commit | 17f83df9604ef9239694e8fd5a9efb894fd28453 (patch) | |
tree | d6beaa1efb85ab233f1a8088352b6bd384f1aa6a | |
parent | 280a0c17d75ec6563d45233c25997bc3df542c35 (diff) | |
parent | 7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9 (diff) | |
download | frameworks_base-17f83df9604ef9239694e8fd5a9efb894fd28453.zip frameworks_base-17f83df9604ef9239694e8fd5a9efb894fd28453.tar.gz frameworks_base-17f83df9604ef9239694e8fd5a9efb894fd28453.tar.bz2 |
am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
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 a278466..c9c9fd7 100644 --- a/graphics/java/android/graphics/drawable/BitmapDrawable.java +++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java @@ -546,10 +546,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 != null ? state.mBitmap : null); } |