commit db46eddd188635d5ee3d2b91fd2cc0514c9b703a
author Yorke Lee <yorkelee@google.com> Wed May 28 15:02:22 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 28 15:02:22 2014 +0000
tree 0316175535794f92198f9ab8869ecdfaf548e568
parent 97f5a1db72fa5eaefc609ec14f3fa450401a0eac
parent 1e5061b39ae3d30b96c41e8c311e471b203e00ea

am 1e5061b3: Merge "Fix NPE caused by null velocity tracker" into lmp-preview-dev

* commit '1e5061b39ae3d30b96c41e8c311e471b203e00ea':
  Fix NPE caused by null velocity tracker

src/com/android/dialer/widget/ViewDragHelper.java

diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java
index 6881e4b..3d55ad4 100644
--- a/src/com/android/dialer/widget/ViewDragHelper.java
+++ b/src/com/android/dialer/widget/ViewDragHelper.java
@@ -1454,6 +1454,9 @@
      * @param target The child view that is dispatching the nested scroll.
      */
     public void startNestedScroll(View target) {
+        if (mVelocityTracker == null) {
+            mVelocityTracker = VelocityTracker.obtain();
+        }
         setDragState(STATE_DRAGGING);
         mCapturedView = target;
     }