diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-05-25 19:00:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 19:00:42 -0700 |
| commit | fd86ab8a0f15bb15a8c274b8ea61743216f39532 (patch) | |
| tree | 7f6393c492efab1329ada072ac3650884e75537d /services | |
| parent | 31caa0e6e5c83cb03518ffe423ea5e37e452c8ae (diff) | |
| parent | 919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2 (diff) | |
| download | frameworks_base-fd86ab8a0f15bb15a8c274b8ea61743216f39532.zip frameworks_base-fd86ab8a0f15bb15a8c274b8ea61743216f39532.tar.gz frameworks_base-fd86ab8a0f15bb15a8c274b8ea61743216f39532.tar.bz2 | |
am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
Fix deadlock in dispatcher. (DO NOT MERGE)
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! } } |