From 93bf1fe1f0d5721d910bab65098dc68493ebcb31 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Tue, 26 May 2020 17:22:13 -0700
Subject: [PATCH] Validate pointer index in PagedView#onMotionEvent

Fixes: 157400422
Change-Id: I556e2e05323ec7f0a47a8a8e3321b8196ee77bcc
---
 src/com/android/launcher3/PagedView.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 359190cc58..dc1ff6695b 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1198,6 +1198,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
             if (mIsBeingDragged) {
                 final int activePointerId = mActivePointerId;
                 final int pointerIndex = ev.findPointerIndex(activePointerId);
+                if (pointerIndex == -1) return true;
+
                 final float primaryDirection = mOrientationHandler.getPrimaryDirection(ev,
                     pointerIndex);
                 final VelocityTracker velocityTracker = mVelocityTracker;