diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-11-16 11:52:03 -0800 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2014-11-16 11:52:03 -0800 |
| commit | 4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 (patch) | |
| tree | c84a3fc0b3b2b2f9d8fcbee6998b053f760614cb /media/libmediaplayerservice | |
| parent | 2dc28b69258d4772aaf40902b939153239e7fe7f (diff) | |
| download | frameworks_av-4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5.zip frameworks_av-4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5.tar.gz frameworks_av-4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5.tar.bz2 | |
Fix missing mutex lock in Drm::binderDied
bug: 18194977
Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp index 2a8b2c6..81dad41 100644 --- a/media/libmediaplayerservice/Drm.cpp +++ b/media/libmediaplayerservice/Drm.cpp @@ -674,10 +674,14 @@ status_t Drm::signRSA(Vector<uint8_t> const &sessionId, void Drm::binderDied(const wp<IBinder> &the_late_who) { + mEventLock.lock(); + mListener.clear(); + mEventLock.unlock(); + + Mutex::Autolock autoLock(mLock); delete mPlugin; mPlugin = NULL; closeFactory(); - mListener.clear(); } } // namespace android |