diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-05-25 18:55:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 18:55:52 -0700 |
| commit | 5665770bc4449a96f2365bec71fb012ca2e7bc81 (patch) | |
| tree | 207a26bf594374c3a998af19be637ff0f29a3dab /services | |
| parent | 5a328f0f7cf88a2b917db15aec9f9d1714db3e06 (diff) | |
| parent | 2cb7981e70dd1d4e4368dbef8797d336e0797b61 (diff) | |
| download | frameworks_base-5665770bc4449a96f2365bec71fb012ca2e7bc81.zip frameworks_base-5665770bc4449a96f2365bec71fb012ca2e7bc81.tar.gz frameworks_base-5665770bc4449a96f2365bec71fb012ca2e7bc81.tar.bz2 | |
Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
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! } } |