diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-05-25 18:52:21 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@android.com> | 2011-05-25 18:53:49 -0700 |
| commit | 2cb7981e70dd1d4e4368dbef8797d336e0797b61 (patch) | |
| tree | 4dbab6702f87bedd2c1898690857abd5d5521155 /services | |
| parent | b416e241db85b678cdfcdee1c74a7f356a5554ef (diff) | |
| download | frameworks_base-2cb7981e70dd1d4e4368dbef8797d336e0797b61.zip frameworks_base-2cb7981e70dd1d4e4368dbef8797d336e0797b61.tar.gz frameworks_base-2cb7981e70dd1d4e4368dbef8797d336e0797b61.tar.bz2 | |
Fix deadlock in dispatcher. (DO NOT MERGE)
This regression was caused due to a bad cherry-pick / merge.
Change-Id: I79e84285bbfd4cd4b66681461543fb185b60d3ba
Diffstat (limited to 'services')
| -rw-r--r-- | services/input/InputDispatcher.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ 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! } } |