From f6c763d6a4c84a576ed0ec99b8c22f3550eb39ba Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 25 Sep 2014 15:13:15 -0700
Subject: Protect against ImageView changing to a null Drawable during
 Transition.

Bug 17600191

Change-Id: I5918866dbb6594725f4712a92acdef23003e8f3e
---
 core/java/android/widget/ImageView.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to '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 @@ 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 {
-- 
cgit v1.1