Merge "Fix bug in split touches." into gingerbread

2010-09-28 13:27:37 -07:00
parent 88a995edcf aeec2bf66a
commit 65a5ba4555
1 changed files with 2 additions and 1 deletions
--- 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) {