diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-05-28 14:58:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 14:58:48 +0000 |
| commit | 1e5061b39ae3d30b96c41e8c311e471b203e00ea (patch) | |
| tree | b58363802490365b8451c7ec27355f0abb33a63f /src | |
| parent | 4d3540c5594f4330d46604dda1480bda707321ea (diff) | |
| parent | 125e95f0c95f40587af8c2a3fe5e678925afe315 (diff) | |
Merge "Fix NPE caused by null velocity tracker" into lmp-preview-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/widget/ViewDragHelper.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java index 6881e4b8f..3d55ad47c 100644 --- a/src/com/android/dialer/widget/ViewDragHelper.java +++ b/src/com/android/dialer/widget/ViewDragHelper.java @@ -1454,6 +1454,9 @@ public class ViewDragHelper { * @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; } |