commit 8a309c257a97d9c4c402fae5f00941e8169ea541
author Michael Jurka <mikejurka@google.com> Thu Jan 12 06:06:59 2012 -0800
committer Michael Jurka <mikejurka@google.com> Thu Jan 12 06:06:59 2012 -0800
tree 88e4c9384fab37253cb1fd60fe45bb1a9ee6aff0
parent 7407d2a16ed6cf22494122cf683bf13de6fa3695

Fix NPE caused in LauncherViewPropertyAnimator

Change-Id: Ia0e388ee1ff6c3b364787d236c96dcd2c704d452

src/com/android/launcher2/LauncherViewPropertyAnimator.java

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