diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-28 13:30:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 13:30:15 -0700 |
| commit | 7d6f864f9ee66035bab98e61e9947d2389f1f341 (patch) | |
| tree | 91f9f74c544ba5c71642690f263f35db7216f10a /libs | |
| parent | 387bdcdadc312c8e9f702da164bd8bd53cbd92fd (diff) | |
| parent | 65a5ba45559e88a50c258d794a1728498c248376 (diff) | |
| download | frameworks_base-7d6f864f9ee66035bab98e61e9947d2389f1f341.zip frameworks_base-7d6f864f9ee66035bab98e61e9947d2389f1f341.tar.gz frameworks_base-7d6f864f9ee66035bab98e61e9947d2389f1f341.tar.bz2 | |
am 65a5ba45: Merge "Fix bug in split touches." into gingerbread
Merge commit '65a5ba45559e88a50c258d794a1728498c248376' into gingerbread-plus-aosp
* commit '65a5ba45559e88a50c258d794a1728498c248376':
Fix bug in split touches.
Diffstat (limited to 'libs')
| -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) { |