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

Commit fdec2c1b authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Lock drm plugin API calls globally, not per MediaDrm instance"

parents ea9ac8bf 2fb561a6

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;