diff options
| author | 2010-10-15 18:40:45 -0700 | |
|---|---|---|
| committer | 2010-10-15 18:40:45 -0700 | |
| commit | fb1c1ba4ad09177a61a64b0c57cacacc327d38d2 (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /libs/ui/InputDispatcher.cpp | |
| parent | e6ba89b3caf970aa742d47d4e71495f54cb4a694 (diff) | |
| parent | 86e69e2339dce389504cccfc9499d27ac3bb13eb (diff) | |
am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp
* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
Fix a native crash in input dispatcher when windows are removed.
Diffstat (limited to 'libs/ui/InputDispatcher.cpp')
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp index 41123284f9..92daee19ea 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); } } |