Merge "Fix NPE caused in LauncherViewPropertyAnimator"

2012-01-12 10:42:11 -08:00
parent 4f1a2db344 8a309c257a
commit efcb54052b
1 changed files with 5 additions and 3 deletions
@@ -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