From 4dbc8cc68a2674110ac1dce9e475ac30b1baa7c5 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Sun, 16 Nov 2014 11:52:03 -0800
Subject: Fix missing mutex lock in Drm::binderDied

bug: 18194977
Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
---
 media/libmediaplayerservice/Drm.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '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 @@ 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
-- 
cgit v1.1