summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-28 13:24:41 -0700
committerJeff Brown <jeffbrown@google.com>2010-09-28 13:26:42 -0700
commit1c322584439f00722ad091777404f2c022390a53 (patch)
treee5e6642b836ec72d37f128af9e20f24236141ffe /libs
parentce6a06d54ef8ae5f1116260a1b01ee6fa93ddf6f (diff)
downloadframeworks_native-1c322584439f00722ad091777404f2c022390a53.zip
frameworks_native-1c322584439f00722ad091777404f2c022390a53.tar.gz
frameworks_native-1c322584439f00722ad091777404f2c022390a53.tar.bz2
Fix bug in split touches.
Change-Id: I808c2201a06938f82817058059f4ddcc9b1a9ae2
Diffstat (limited to 'libs')
-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 b5744b3..9544a95 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) {