summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-13 17:01:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-13 17:01:53 -0700
commit9f164aa9b39ddd42963f52ca47d1739ee4bb1e7d (patch)
tree445b6f4970325f6a663f262547497a36f3dbcb26 /libs/ui
parent8635bb5405a50b86badcb3e674032d6f444d4944 (diff)
parentb05632aae37ea3a3573aabf10e6868733546de96 (diff)
downloadframeworks_base-9f164aa9b39ddd42963f52ca47d1739ee4bb1e7d.zip
frameworks_base-9f164aa9b39ddd42963f52ca47d1739ee4bb1e7d.tar.gz
frameworks_base-9f164aa9b39ddd42963f52ca47d1739ee4bb1e7d.tar.bz2
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.
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/InputDispatcher.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 52e488a..3b9ef6d 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -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,