Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb561a6 authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Lock drm plugin API calls globally, not per MediaDrm instance 

Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc
related-to-bug: 18394494
related-to-bug: 19664283
parent 983f2e02

media/libmediaplayerservice/Drm.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

media/libmediaplayerservice/Drm.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct Drm : public BnDrm, 
    virtual void binderDied(const wp<IBinder> &the_late_who);



private:

    mutable Mutex mLock;

    static Mutex mLock;



    status_t mInitCheck;