diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-18 10:31:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:31:43 -0700 |
| commit | 195226a3c83be8f3b2cfaeab3e5db0b9165ef414 (patch) | |
| tree | 1d3a8583b2d27976bc88dec4d888fddf642c5f17 /libs | |
| parent | d21de4b921a8969b0558cffade0a39fe14ba8a54 (diff) | |
| parent | 9e0e054388689fd618c84a283c28ee484477b44d (diff) | |
| download | frameworks_base-195226a3c83be8f3b2cfaeab3e5db0b9165ef414.zip frameworks_base-195226a3c83be8f3b2cfaeab3e5db0b9165ef414.tar.gz frameworks_base-195226a3c83be8f3b2cfaeab3e5db0b9165ef414.tar.bz2 | |
am 9e0e0543: am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread
Merge commit '9e0e054388689fd618c84a283c28ee484477b44d'
* commit '9e0e054388689fd618c84a283c28ee484477b44d':
Fix a native crash in input dispatcher when windows are removed.
Diffstat (limited to 'libs')
| -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 949dc4d..93bde13 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); } } |