commit ef4cd0a439d30b6b6fdfc5ad78a842422e091331
author Jeff Tinker <jtinker@google.com> Thu Jul 23 18:33:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 23 18:33:29 2015 +0000
tree 4eaf494f1abc4af30cf7bd7f62717904ff45c2aa
parent fc9c5e6048becb1a671a0015d4ab343346b2fa0f
parent d383176062362947455866af831d7db6ab085361

am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance

* commit 'd383176062362947455866af831d7db6ab085361':
  DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance

media/libmediaplayerservice/Drm.cpp

diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index 81dad41..ac948a6 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -46,6 +46,7 @@
 KeyedVector<Vector<uint8_t>, String8> Drm::mUUIDToLibraryPathMap;
 KeyedVector<String8, wp<SharedLibrary> > Drm::mLibraryPathToOpenLibraryMap;
 Mutex Drm::mMapLock;
+Mutex Drm::mLock;
 
 static bool operator<(const Vector<uint8_t> &lhs, const Vector<uint8_t> &rhs) {
     if (lhs.size() < rhs.size()) {

media/libmediaplayerservice/Drm.h

diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h
index 0e1eb2c..2997da1 100644
--- a/media/libmediaplayerservice/Drm.h
+++ b/media/libmediaplayerservice/Drm.h
@@ -134,7 +134,7 @@
     virtual void binderDied(const wp<IBinder> &the_late_who);
 
 private:
-    mutable Mutex mLock;
+    static Mutex mLock;
 
     status_t mInitCheck;