Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 152266fb authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE in processNestedScroll 

Null check mCapturedView.

Bug:18114408
Change-Id: I5abb9f5bcca37aafab55f12c69d824ab92faf68f
parent c311af1f

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

+6 −0
Original line number Diff line number Diff line
@@ -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);