From 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Wed, 22 Apr 2015 15:58:16 -0700
Subject: 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 | 1 +
 1 file changed, 1 insertion(+)

(limited to '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 @@ static bool checkPermission(const char* permissionString) {
 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()) {
-- 
cgit v1.1