diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-11-18 03:46:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-18 03:46:55 +0000 |
| commit | 35b0f7095fac4f2cc112edd4b0298a9cb1ee394f (patch) | |
| tree | ccec4b11226708f7f4fdba55d4dfdcf42220bb56 /media | |
| parent | 4d0a5985fb5e7ea5a1f9a605afea2b7534ebc16b (diff) | |
| parent | 4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 (diff) | |
| download | frameworks_av-35b0f7095fac4f2cc112edd4b0298a9cb1ee394f.zip frameworks_av-35b0f7095fac4f2cc112edd4b0298a9cb1ee394f.tar.gz frameworks_av-35b0f7095fac4f2cc112edd4b0298a9cb1ee394f.tar.bz2 | |
Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev
Diffstat (limited to 'media')
| -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 |