diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 14:57:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 14:57:18 -0700 |
commit | 7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9 (patch) | |
tree | 4abbaa20027f3dc4b33453110a29a8be4fa5a31a | |
parent | 889bb20f1bb47437331d404a59b86e6dfa4e2e93 (diff) | |
parent | f26ec38c344af8cf91575b461028a3033b940d49 (diff) | |
download | frameworks_base-7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9.zip frameworks_base-7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9.tar.gz frameworks_base-7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9.tar.bz2 |
am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
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 2c09ddc..6e62ab3 100644 --- a/graphics/java/android/graphics/drawable/BitmapDrawable.java +++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java @@ -486,10 +486,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); } |