commit fb1c1ba4ad09177a61a64b0c57cacacc327d38d2
author Jeff Brown <jeffbrown@google.com> Fri Oct 15 18:40:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 15 18:40:45 2010 -0700
tree 019ca26084abbcccb357df956b5df2b574c4e8e2
parent e6ba89b3caf970aa742d47d4e71495f54cb4a694
parent 86e69e2339dce389504cccfc9499d27ac3bb13eb

am 36e65ffd: Merge "Fix a native crash in input dispatcher when windows are removed." into gingerbread

Merge commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a' into gingerbread-plus-aosp

* commit '36e65ffd16f2610dcec702e23d596fe4eb6b6c4a':
  Fix a native crash in input dispatcher when windows are removed.

libs/ui/InputDispatcher.cpp

diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 4112328..92daee1 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -2536,9 +2536,9 @@
 #if DEBUG_FOCUS
                 LOGD("Touched window was removed: %s", touchedWindow.channel->getName().string());
 #endif
-                mTouchState.windows.removeAt(i);
                 synthesizeCancelationEventsForInputChannelLocked(touchedWindow.channel,
                         InputState::CANCEL_POINTER_EVENTS, "touched window was removed");
+                mTouchState.windows.removeAt(i);
             }
         }