diff options
author | Jeff Tinker <jtinker@google.com> | 2015-07-24 19:45:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 19:45:17 +0000 |
commit | f18cce444091d40386fce32ebfdf6b130d07b131 (patch) | |
tree | 02eefd3c8874871d98dde1d4dbfac3066a5e5454 /media/libmediaplayerservice | |
parent | 907d0c529b28f03814baccb86421ba376d6203c9 (diff) | |
parent | ef4cd0a439d30b6b6fdfc5ad78a842422e091331 (diff) | |
download | frameworks_av-f18cce444091d40386fce32ebfdf6b130d07b131.zip frameworks_av-f18cce444091d40386fce32ebfdf6b130d07b131.tar.gz frameworks_av-f18cce444091d40386fce32ebfdf6b130d07b131.tar.bz2 |
am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
* commit 'ef4cd0a439d30b6b6fdfc5ad78a842422e091331':
DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance
Diffstat (limited to 'media/libmediaplayerservice')
-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 73f1a2a..9d5ba15 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; |