diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-04-22 15:58:16 -0700 |
|---|---|---|
| committer | Rachad Alao <rachad@google.com> | 2015-07-23 01:33:51 +0000 |
| commit | d383176062362947455866af831d7db6ab085361 (patch) | |
| tree | 4eaf494f1abc4af30cf7bd7f62717904ff45c2aa /media | |
| parent | d5d23f6438cd77f18a93658b1bb67326d5f7c73b (diff) | |
| download | frameworks_av-d383176062362947455866af831d7db6ab085361.zip frameworks_av-d383176062362947455866af831d7db6ab085361.tar.gz frameworks_av-d383176062362947455866af831d7db6ab085361.tar.bz2 | |
DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
Bug: 22414321
Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283
(cherry picked from commit 2fb561a6fe9bca79c50a81e90fc4bb4eb18af0be)
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Drm.h | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ 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()) { 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 @@ struct Drm : public BnDrm, virtual void binderDied(const wp<IBinder> &the_late_who); private: - mutable Mutex mLock; + static Mutex mLock; status_t mInitCheck; |