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 | ace3dc4f7cda6b7211b3bab4f33dff8948477791 (patch) | |
| tree | e3769d4056e98754d7f421575de730e460567a6c /libs | |
| parent | 8def48bb9b8509a123ca4c0818b573b1a7c87e0b (diff) | |
| parent | fb1c1ba4ad09177a61a64b0c57cacacc327d38d2 (diff) | |
| download | frameworks_native-ace3dc4f7cda6b7211b3bab4f33dff8948477791.zip frameworks_native-ace3dc4f7cda6b7211b3bab4f33dff8948477791.tar.gz frameworks_native-ace3dc4f7cda6b7211b3bab4f33dff8948477791.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); } } |