diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-01-12 10:42:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 10:42:11 -0800 |
| commit | efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051 (patch) | |
| tree | b531b6951b95645d21c4e1fd6757be89d90f1728 | |
| parent | 4f1a2db34498ba6addb0d0307bbd33ab25ddcee1 (diff) | |
| parent | 8a309c257a97d9c4c402fae5f00941e8169ea541 (diff) | |
| download | android_packages_apps_Trebuchet-efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051.tar.gz android_packages_apps_Trebuchet-efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051.tar.bz2 android_packages_apps_Trebuchet-efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051.zip | |
Merge "Fix NPE caused in LauncherViewPropertyAnimator"
| -rw-r--r-- | src/com/android/launcher2/LauncherViewPropertyAnimator.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java index f5becdcbd..b31179d6a 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 |