summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-10-15 16:52:10 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-15 16:52:10 -0700
commit36e65ffd16f2610dcec702e23d596fe4eb6b6c4a (patch)
tree8224e6592216e144e22c6790a91ab0d6f4419d0b
parentc1a564b108c511c0bdd699567c245b031930e718 (diff)
parentaf48cae6e59f579c20c3ecd08623214896e7923e (diff)
Merge "Fix a native crash in input dispatcher when windows are removed." 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 41123284f977..92daee19eaec 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -2536,9 +2536,9 @@ void InputDispatcher::setInputWindows(const Vector<InputWindow>& inputWindows) {
#if DEBUG_FOCUS
LOGD("Touched window was removed: %s", touchedWindow.channel->getName().string());
#endif
- mTouchState.windows.removeAt(i);
synthesizeCancelationEventsForInputChannelLocked(touchedWindow.channel,
InputState::CANCEL_POINTER_EVENTS, "touched window was removed");
+ mTouchState.windows.removeAt(i);
}
}