Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev

Browse Source
This commit is contained in:
Zach Kuznia
2016-05-25 20:57:24 +00:00
committed by Android (Google) Code Review
parent dfe232c763 ec1783828e
commit a5e6601ad1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/accessibility/java/com/android/server/accessibility/TouchExplorer.java
View File

@@ -648,7 +648,16 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe
* @param policyFlags The policy flags associated with the event. * @param policyFlags The policy flags associated with the event.
*/ */
private void handleMotionEventStateDragging(MotionEvent event, int policyFlags) { private void handleMotionEventStateDragging(MotionEvent event, int policyFlags) {
final int pointerIdBits = (1 << mDraggingPointerId); int pointerIdBits = 0;
// Clear the dragging pointer id if it's no longer valid.
if (event.findPointerIndex(mDraggingPointerId) == -1) {
Slog.e(LOG_TAG, "mDraggingPointerId doesn't match any pointers on current event. " +
"mDraggingPointerId: " + Integer.toString(mDraggingPointerId) +
", Event: " + event);
mDraggingPointerId = INVALID_POINTER_ID;
} else {
pointerIdBits = (1 << mDraggingPointerId);
}
switch (event.getActionMasked()) { switch (event.getActionMasked()) {
case MotionEvent.ACTION_DOWN: { case MotionEvent.ACTION_DOWN: {
throw new IllegalStateException("Dragging state can be reached only if two " throw new IllegalStateException("Dragging state can be reached only if two "
@@ -664,6 +673,9 @@ class TouchExplorer implements EventStreamTransformation, AccessibilityGestureDe
sendDownForAllNotInjectedPointers(event, policyFlags); sendDownForAllNotInjectedPointers(event, policyFlags);
} break; } break;
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
if (mDraggingPointerId == INVALID_POINTER_ID) {
break;
}
switch (event.getPointerCount()) { switch (event.getPointerCount()) {
case 1: { case 1: {
// do nothing // do nothing