Merge "Ignore motion event of invalid pointer" into qt-dev

am: 9b887ef5e5 Change-Id: Ia07423b96ef55febb894d56b07336ede92914c10
2019-05-13 16:20:34 -07:00
parent 97fb2a69bf 9b887ef5e5
commit f1ff317c3a
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -180,7 +180,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
                }
                int index = event.findPointerIndex(mActivePointerId);
                int touchSlop = mViewConfiguration.getScaledTouchSlop();
-                if (mCurrentSecurityView != null
+                if (mCurrentSecurityView != null && index != -1
                        && mStartTouchY - event.getY(index) > touchSlop) {
                    mIsDragging = true;
                    return true;