commit 35b0f7095fac4f2cc112edd4b0298a9cb1ee394f
author Jeff Tinker <jtinker@google.com> Tue Nov 18 03:46:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 18 03:46:55 2014 +0000
tree ccec4b11226708f7f4fdba55d4dfdcf42220bb56
parent 4d0a5985fb5e7ea5a1f9a605afea2b7534ebc16b
parent 4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5

Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-dev

media/libmediaplayerservice/Drm.cpp

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 @@
 
 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