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

* commit '82fd842827fcdb3570d0c606bd049f42bf2b3fba': Protect against ImageView changing to a null Drawable during Transition.
2014-10-23 21:52:13 +00:00
parent f3ab441090 82fd842827
commit 039cc06049
1 changed files with 3 additions and 0 deletions
--- 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 {