commit 0c1f756812442aa61fcd9c19c009657729a05d80
author Jeff Brown <jeffbrown@google.com> Tue Sep 28 13:24:41 2010 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Sep 28 13:41:00 2010 -0700
tree 2af73f224846e02e97118f4fccaabb59764759fd
parent b974d0c8f21000354bec04dea9cc6c938cdccccd

Fix bug in split touches.

Cherry-picked down to master.

Change-Id: I786761bd6aecc021ae22d8c9a022324f3a9980d1

libs/ui/InputDispatcher.cpp

diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 8db8c42..16ce24b 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -1070,7 +1070,8 @@
         }
 
         // 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) {