summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-11 20:22:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-11 20:22:02 -0700
commita28d5aff5466a55149b9e6f9cd908fcc225c25ff (patch)
treedd4ea71e6f5c4915c61fbd4a4e61b7b95be69795
parentece7e11b3723140b31d28bae6ed6f1ae30e5d802 (diff)
parenta1160a798b688370bed3642a105dfeb7fba2f5f3 (diff)
downloadframeworks_base-a28d5aff5466a55149b9e6f9cd908fcc225c25ff.zip
frameworks_base-a28d5aff5466a55149b9e6f9cd908fcc225c25ff.tar.gz
frameworks_base-a28d5aff5466a55149b9e6f9cd908fcc225c25ff.tar.bz2
Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
-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 41b6ff3..054042f 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -3320,7 +3320,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,