commit 890f20e8e84e91173edf6890f5bb6da5cd0418d2
author George Mount <mount@google.com> Thu Oct 23 22:04:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 23 22:04:28 2014 +0000
tree ad74815adb9ca7ef674a07d2ccba6046136c58b7
parent ab43570f5db770e55a73ccff346b3e922443d126
parent 039cc060493a88a603cc8f3224a9ac2fa31908be

am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

* commit '039cc060493a88a603cc8f3224a9ac2fa31908be':
  Protect against ImageView changing to a null Drawable during Transition.

core/java/android/widget/ImageView.java

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 @@
 
     /** @hide */
     public void animateTransform(Matrix matrix) {
+        if (mDrawable == null) {
+            return;
+        }
         if (matrix == null) {
             mDrawable.setBounds(0, 0, getWidth(), getHeight());
         } else {