am 65a5ba45: Merge "Fix bug in split touches." into gingerbread

Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp

* commit '65a5ba45559e88a50c258d794a1728498c248376':
  Fix bug in split touches.
This commit is contained in:
Jeff Brown
2010-09-28 13:30:15 -07:00
committed by Android Git Automerger

View File

@@ -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) {