Fix NPE caused in LauncherViewPropertyAnimator
Change-Id: Ia0e388ee1ff6c3b364787d236c96dcd2c704d452
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