diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 13:10:20 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-04-12 13:15:48 -0700 |
| commit | 874b55f51c4c062c65aee043ec0f26044b504556 (patch) | |
| tree | 86d4c6cd8ec51091ae4998e326dd20392e983163 /media/libstagefright/include/TimedEventQueue.h | |
| parent | b547d09ecc3da8ee300099da8ca7e2826bb6849a (diff) | |
| download | frameworks_av-874b55f51c4c062c65aee043ec0f26044b504556.zip frameworks_av-874b55f51c4c062c65aee043ec0f26044b504556.tar.gz frameworks_av-874b55f51c4c062c65aee043ec0f26044b504556.tar.bz2 | |
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Change-Id: I4e42e318fd5373d1f352f54027d4bf823126266d
related-to-bug: 2585276
Diffstat (limited to 'media/libstagefright/include/TimedEventQueue.h')
| -rw-r--r-- | media/libstagefright/include/TimedEventQueue.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/include/TimedEventQueue.h b/media/libstagefright/include/TimedEventQueue.h index 21eade3..11f844c 100644 --- a/media/libstagefright/include/TimedEventQueue.h +++ b/media/libstagefright/include/TimedEventQueue.h @@ -121,6 +121,8 @@ private: static void *ThreadWrapper(void *me); void threadEntry(); + sp<Event> removeEventFromQueue_l(event_id id); + TimedEventQueue(const TimedEventQueue &); TimedEventQueue &operator=(const TimedEventQueue &); }; |