diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-28 13:27:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-28 13:27:37 -0700 |
| commit | 65a5ba45559e88a50c258d794a1728498c248376 (patch) | |
| tree | f32b6d84a2d3f86ea4559fc60586b01a44cce097 | |
| parent | 88a995edcf3c371845cb32aed8bcddb7509bf875 (diff) | |
| parent | aeec2bf66a6119261ca47d98ef1aef954fb56462 (diff) | |
| download | frameworks_base-65a5ba45559e88a50c258d794a1728498c248376.zip frameworks_base-65a5ba45559e88a50c258d794a1728498c248376.tar.gz frameworks_base-65a5ba45559e88a50c258d794a1728498c248376.tar.bz2 | |
Merge "Fix bug in split touches." into gingerbread
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 3 |
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) { |