commit | 2cb7981e70dd1d4e4368dbef8797d336e0797b61 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@android.com> | Wed May 25 18:52:21 2011 -0700 |
committer | Jeff Brown <jeffbrown@android.com> | Wed May 25 18:53:49 2011 -0700 |
tree | 4dbab6702f87bedd2c1898690857abd5d5521155 | |
parent | b416e241db85b678cdfcdee1c74a7f356a5554ef [diff] |
Fix deadlock in dispatcher. (DO NOT MERGE) This regression was caused due to a bad cherry-pick / merge. Change-Id: I79e84285bbfd4cd4b66681461543fb185b60d3ba
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index d9ef819..9a77af3 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp
@@ -2432,7 +2432,6 @@ // Do the batching magic. batchMotionLocked(motionEntry, eventTime, metaState, pointerCoords, "pending motion event"); - mLock.unlock(); return; // done! } }