diff options
| author | George Mount <mount@google.com> | 2014-10-23 21:46:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-23 21:46:54 +0000 |
| commit | 82fd842827fcdb3570d0c606bd049f42bf2b3fba (patch) | |
| tree | 004b444f163544fd8a1b46473d83b2e987468513 /core/java/android/widget | |
| parent | fa9ed8ca0a08be0b32b2ccc33563a47df1f6d3da (diff) | |
| parent | f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba (diff) | |
| download | frameworks_base-82fd842827fcdb3570d0c606bd049f42bf2b3fba.zip frameworks_base-82fd842827fcdb3570d0c606bd049f42bf2b3fba.tar.gz frameworks_base-82fd842827fcdb3570d0c606bd049f42bf2b3fba.tar.bz2 | |
Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index f90a9fe..75dfcca 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -1120,6 +1120,9 @@ public class ImageView extends View { /** @hide */ public void animateTransform(Matrix matrix) { + if (mDrawable == null) { + return; + } if (matrix == null) { mDrawable.setBounds(0, 0, getWidth(), getHeight()); } else { |