diff options
| author | 2010-09-28 13:30:15 -0700 | |
|---|---|---|
| committer | 2010-09-28 13:30:15 -0700 | |
| commit | ae3a02e07f614d0282cad7c0e89c83fd38e89074 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf | |
| parent | 009bc61b9afd7e9b86c7b0df72eb02357800c63e (diff) | |
| parent | adf739abc441cb2d1f7ffd5ac54387a5fc0cf81f (diff) | |
am 65a5ba45: Merge "Fix bug in split touches." into gingerbread
Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp
* commit '65a5ba45559e88a50c258d794a1728498c248376':
Fix bug in split touches.
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp index b5744b3e5e..9544a95fbb 100644 --- a/libs/ui/InputDispatcher.cpp +++ b/libs/ui/InputDispatcher.cpp @@ -1070,7 +1070,8 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, } // Figure out whether splitting will be allowed for this window. - if (newTouchedWindow->layoutParamsFlags & InputWindow::FLAG_SPLIT_TOUCH) { + if (newTouchedWindow + && (newTouchedWindow->layoutParamsFlags & InputWindow::FLAG_SPLIT_TOUCH)) { // New window supports splitting. isSplit = true; } else if (isSplit) { |