commit 59882c81f3ff3422e29f573cd49f7efdc1516c4e
author Chris Banes <chrisbanes@google.com> Wed Oct 14 14:35:43 2015 +0100
committer Chris Banes <chrisbanes@google.com> Wed Oct 14 14:35:43 2015 +0100
tree 32c25766f35e71346403b13144053614f80693df
parent bb7b05db84a43d258d1f7b0d5c4eef4b623fdc4d

Fix NPE when calling setUpdateListener(null)

BUG: 24931167
Change-Id: I931c4060c8a892b950085383473f228faf0dd567

v4/kitkat/android/support/v4/view/ViewPropertyAnimatorCompatKK.java

diff --git a/v4/kitkat/android/support/v4/view/ViewPropertyAnimatorCompatKK.java b/v4/kitkat/android/support/v4/view/ViewPropertyAnimatorCompatKK.java
index 5439972..64f1969 100644
--- a/v4/kitkat/android/support/v4/view/ViewPropertyAnimatorCompatKK.java
+++ b/v4/kitkat/android/support/v4/view/ViewPropertyAnimatorCompatKK.java
@@ -22,12 +22,16 @@
 
     public static void setUpdateListener(final View view,
             final ViewPropertyAnimatorUpdateListener listener) {
-        view.animate().setUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                listener.onAnimationUpdate(view);
-            }
-        });
+        ValueAnimator.AnimatorUpdateListener wrapped = null;
+        if (listener != null) {
+            wrapped = new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                    listener.onAnimationUpdate(view);
+                }
+            };
+        }
+        view.animate().setUpdateListener(wrapped);
     }
 
 }