drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 601d5817: Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0

Browse Source 
* commit '601d5817301bc79c34c30e7b606fe872b2b76c31':
  TouchExplorer crashes if there is incative pointer while dragging.
This commit is contained in:
Svetoslav Ganov
2011-10-18 11:54:03 -07:00
committed by Android Git Automerger
parent 0ad8c3c86e 601d581730
commit 12ca1fa78a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,8 +487,16 @@ public class TouchExplorer implements Explorer {
}
} break;
case MotionEvent.ACTION_POINTER_UP: {
// Send an event to the end of the drag gesture.
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
final int activePointerCount = mPointerTracker.getActivePointerCount();
switch (activePointerCount) {
case 1: {
// Send an event to the end of the drag gesture.
sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
} break;
default: {
mCurrentState = STATE_TOUCH_EXPLORING;
}
}
} break;
case MotionEvent.ACTION_UP: {
mCurrentState = STATE_TOUCH_EXPLORING;