commit 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be
author Jeff Tinker <jtinker@google.com> Wed Apr 22 15:58:16 2015 -0700
committer Jeff Tinker <jtinker@google.com> Wed Apr 22 15:58:16 2015 -0700
tree 85257151d1a091df6ead1e6b1ca44ebffe1ac342
parent 983f2e02b342ef3ac4004471cbfd4cd8d5aecf7d

Lock drm plugin API calls globally, not per MediaDrm instance

Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283

media/libmediaplayerservice/Drm.cpp

diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index 8ca8769..d55482d 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -52,6 +52,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()) {