am 7c1e8533: Call onCancelBatchInput only when onStartBatchInput has been called

* commit '7c1e853387f71235fd0bd8051246f7a95be5ed53':
  Call onCancelBatchInput only when onStartBatchInput has been called
This commit is contained in:
Tadashi G. Takaoka 2012-12-20 21:37:46 -08:00 committed by Android Git Automerger
commit c366ea036b

View file

@ -791,6 +791,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
private void cancelBatchInput() {
sPointerTrackerQueue.cancelAllPointerTracker();
if (!sInGesture) {
return;
}
sInGesture = false;
if (DEBUG_LISTENER) {
Log.d(TAG, String.format("[%d] onCancelBatchInput", mPointerId));
@ -1208,9 +1211,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
printTouchEvent("onCancelEvt:", x, y, eventTime);
}
if (sInGesture) {
cancelBatchInput();
}
cancelBatchInput();
sPointerTrackerQueue.cancelAllPointerTracker();
sPointerTrackerQueue.releaseAllPointers(eventTime);
onCancelEventInternal();