diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-11-18 03:55:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 03:55:05 +0000 |
| commit | e6dce194ad3a13e302641250ef175c4263b7a448 (patch) | |
| tree | 40764cb5f69ff6bfae9218e28134e4e2df969ec5 /media/libmediaplayerservice/Drm.cpp | |
| parent | a248703b0799a9a27481f0ec13df90214a661eb5 (diff) | |
| parent | efd33e8da29243b6bddf3f787034960b0717de90 (diff) | |
| download | frameworks_av-e6dce194ad3a13e302641250ef175c4263b7a448.zip frameworks_av-e6dce194ad3a13e302641250ef175c4263b7a448.tar.gz frameworks_av-e6dce194ad3a13e302641250ef175c4263b7a448.tar.bz2 | |
am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev
* commit 'efd33e8da29243b6bddf3f787034960b0717de90':
Fix missing mutex lock in Drm::binderDied
Diffstat (limited to 'media/libmediaplayerservice/Drm.cpp')
| -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 0e59e4b..73f1a2a 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 |