commit e708b34802490de7b5aa5bfe0dae24e1f67739f3
author Chia-chi Yeh <chiachi@android.com> Tue Sep 28 19:40:59 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 28 19:40:59 2010 -0700
tree e5e6642b836ec72d37f128af9e20f24236141ffe
parent ef3021c20e76865897a7f087469beb1374d22021
parent ced8172ac1c4b0140751e1e285d795494a206128

Merge changes Iae1913fb,I38dbefef into gingerbread

* changes:
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.

libs/ui/InputDispatcher.cpp

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 @@
         }
 
         // 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) {