diff options
| author | George Mount <mount@google.com> | 2014-09-25 15:13:15 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-10-07 00:35:10 +0000 |
| commit | f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba (patch) | |
| tree | ac0340612d6e8003db4147b4a738f55d69376d0d /core/java/android/widget/ImageView.java | |
| parent | fcc059dcf0d84a77d9c2b5ef3b01c23afe25f72c (diff) | |
| download | frameworks_base-f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba.zip frameworks_base-f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba.tar.gz frameworks_base-f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba.tar.bz2 | |
Protect against ImageView changing to a null Drawable during Transition.
Bug 17600191
Change-Id: I5918866dbb6594725f4712a92acdef23003e8f3e
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -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 { |