commit cba7f50947567bf35ca5720a619bcd0638e7e481
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 27 05:03:38 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 05:03:38 2020 +0000
tree f4daeb85c7da44f88bbd3fafb57b4fa17fb39073
parent b1eeeafa6fd2c1078d9c317df266250d98427e30
parent 93bf1fe1f0d5721d910bab65098dc68493ebcb31

Merge "Validate pointer index in PagedView#onMotionEvent" into ub-launcher3-rvc-dev

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 359190c..dc1ff66 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1198,6 +1198,8 @@
             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;