Fix bug in split touches.

Cherry-picked down to master. Change-Id: I786761bd6aecc021ae22d8c9a022324f3a9980d1
2010-09-28 13:24:41 -07:00
parent b974d0c8f2
commit 0c1f756812
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) {