From 8a309c257a97d9c4c402fae5f00941e8169ea541 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 12 Jan 2012 06:06:59 -0800
Subject: [PATCH] Fix NPE caused in LauncherViewPropertyAnimator

Change-Id: Ia0e388ee1ff6c3b364787d236c96dcd2c704d452
---
 .../android/launcher2/LauncherViewPropertyAnimator.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
index f5becdcbdb..b31179d6ab 100644
--- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java
+++ b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
@@ -67,7 +67,9 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public void cancel() {
-        mViewPropertyAnimator.cancel();
+        if (mViewPropertyAnimator != null) {
+            mViewPropertyAnimator.cancel();
+        }
     }
 
     @Override
@@ -82,7 +84,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public long getDuration() {
-        return mViewPropertyAnimator.getDuration();
+        return mDuration;
     }
 
     @Override
@@ -92,7 +94,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public long getStartDelay() {
-        return mViewPropertyAnimator.getStartDelay();
+        return mStartDelay;
     }
 
     @Override