am b05632aa: am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread

Merge commit 'b05632aae37ea3a3573aabf10e6868733546de96'

* commit 'b05632aae37ea3a3573aabf10e6868733546de96':
  Fix a bug synthesizing cancelation events for motions.
This commit is contained in:
Jeff Brown 2010-10-13 17:01:53 -07:00 committed by Android Git Automerger
commit 5d0d23dba9

View File

@ -3396,7 +3396,7 @@ void InputDispatcher::InputState::synthesizeCancelationEvents(nsecs_t currentTim
}
}
for (size_t i = 0; i < mMotionMementos.size(); i++) {
for (size_t i = 0; i < mMotionMementos.size(); ) {
const MotionMemento& memento = mMotionMementos.itemAt(i);
if (shouldCancelEvent(memento.source, options)) {
outEvents.push(allocator->obtainMotionEntry(currentTime,