summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-09-28 13:24:41 -0700
committer Jeff Brown <jeffbrown@google.com> 2010-09-28 13:26:42 -0700
commitaeec2bf66a6119261ca47d98ef1aef954fb56462 (patch)
tree07b4a3c9a1e2079b978830bc6a0f7a1d869fc704
parent6d028dd2f102a6eafaa2edebeb55f55b4c32fc42 (diff)
Fix bug in split touches.
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
-rw-r--r--libs/ui/InputDispatcher.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index b5744b3e5eb5..9544a95fbbe9 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) {