Skip to content

Commit 0fd713c

Browse files
Mike CleronAndroid (Google) Code Review
authored andcommitted
Merge "Exception in the touch explorer when dragging." into jb-mr1-dev
2 parents 88c3a51 + ec33d56 commit 0fd713c

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

services/java/com/android/server/accessibility/TouchExplorer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,9 @@ private void handleMotionEventStateDragging(MotionEvent event, int policyFlags)
645645
// We are in dragging state so we have two pointers and another one
646646
// goes down => delegate the three pointers to the view hierarchy
647647
mCurrentState = STATE_DELEGATING;
648-
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
648+
if (mDraggingPointerId != INVALID_POINTER_ID) {
649+
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
650+
}
649651
sendDownForAllActiveNotInjectedPointers(event, policyFlags);
650652
} break;
651653
case MotionEvent.ACTION_MOVE: {

0 commit comments

Comments
 (0)