summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-11-30 19:47:56 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-11-30 19:47:56 +0000
commit321772b4cc666263aa37f88aa2dcefedf789416a (patch)
tree027a539cd4d46e115724ea5385cf482f9095325c
parent65cffffc20489e5c6f7def72b53f30dfd1c25881 (diff)
parent1310e094b5430c6e1eb59fbff386d5fac4013460 (diff)
Merge "Adding pointer index check to recents touch handler."
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
index bfaa8cdb8e27..c91cdfc379c4 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java
@@ -256,6 +256,9 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
}
case MotionEvent.ACTION_MOVE: {
int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+ if (activePointerIndex == -1) {
+ break;
+ }
int y = (int) ev.getY(activePointerIndex);
int x = (int) ev.getX(activePointerIndex);
if (!mIsScrolling) {