Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2

2011-05-25 18:55:52 -07:00
parent 5a328f0f7c 2cb7981e70
commit 5665770bc4
1 changed files with 0 additions and 1 deletions
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -2432,7 +2432,6 @@ void InputDispatcher::notifyMotion(nsecs_t eventTime, int32_t deviceId, uint32_t
                    // Do the batching magic.
                    batchMotionLocked(motionEntry, eventTime, metaState, pointerCoords,
                            "pending motion event");
-                    mLock.unlock();
                    return; // done!
                }
            }