Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0 (601d5817) · Commits · e / os / android_frameworks_base

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

+10 −2

Original line number	Diff line number	Diff line
		@@ -487,9 +487,17 @@ public class TouchExplorer implements Explorer {
		}
		} break;
		case MotionEvent.ACTION_POINTER_UP: {
		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;
		} break;