From 152266fb7ae309942e9a67419f104a29f491c0b8 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Fri, 24 Oct 2014 08:37:12 -0700
Subject: Fix NPE in processNestedScroll

Null check mCapturedView.

Bug:18114408
Change-Id: I5abb9f5bcca37aafab55f12c69d824ab92faf68f
---
 src/com/android/dialer/widget/ViewDragHelper.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/com')

diff --git a/src/com/android/dialer/widget/ViewDragHelper.java b/src/com/android/dialer/widget/ViewDragHelper.java
index a0e1d801b..c0bc2ce29 100644
--- a/src/com/android/dialer/widget/ViewDragHelper.java
+++ b/src/com/android/dialer/widget/ViewDragHelper.java
@@ -1548,6 +1548,12 @@ public class ViewDragHelper {
      *         deltas that it consumed.
      */
     public void processNestedScroll(View target, int dx, int dy, int[] consumed) {
+        if (mCapturedView == null) {
+            // This is safe because consumed array is null when called from
+            // onNestedScroll, and pre-initialized to {0, 0} when called from
+            // onNestedPreScroll.
+            return;
+        }
         final int targetX = mCapturedView.getLeft() + dx;
         final int targetY = mCapturedView.getTop() + dy;
         dragTo(targetX, targetY, dx, dy);
-- 
cgit v1.2.3