commit 93cee864e1d007c2545bfff15976e625c5f80445
author Michael Jurka <mikejurka@google.com> Wed Sep 05 03:28:02 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 05 03:28:02 2012 -0700
tree 706bf76dd68eca610769c22ea33ab6aa43a38f3a
parent 7b8159c6867416c85936a2bcb5a23a72502799be
parent ce44059861254b44c0ccd39ed40673e02797160a

am ce440598: am 7a397e04: Merge "Debug code for bug b/6830207" into jb-mr1-dev

* commit 'ce44059861254b44c0ccd39ed40673e02797160a':
  Debug code for bug b/6830207

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2fcf869..ab361f1 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2474,6 +2474,9 @@
             alphaAnim.addUpdateListener(new AnimatorUpdateListener() {
                 @Override
                 public void onAnimationUpdate(ValueAnimator animation) {
+                    if (animation == null) {
+                        throw new RuntimeException("animation is null");
+                    }
                     float t = (Float) animation.getAnimatedValue();
                     dispatchOnLauncherTransitionStep(fromView, t);
                     dispatchOnLauncherTransitionStep(toView, t);