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